-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA512 Source: aide Version: 0.16~a2.git20130520-2ubuntu0.1 Severity: wishlist Tags: patch
Hi, Please find attached a patch that allows aide to handle multiarch apt files. Regards, Simon Deziel -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iQJ8BAEBCgBmBQJUa7TAXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ1NjVDMzc0QUZCQUQyRkM2MjBDNkMxQkI3 MkZFMERBRTkwMEIyQzM0AAoJEHL+Da6QCyw0oJUP/34wpAJbwQcRAGnPE7MkplZ3 hyqWHvlSraxK5hT9d+4mxlJbqh4hTXn0UVPKg8BTX7G1hksd3n+LYTQfJA/GtjJD tcJQDJOjDExqOlEYrpjMWLEydF9HWwAfvHO1UA0gBudUu4pINjvy/ptzD8VDwmGY 5isVQTo7TrSD2Ba86iBXIaS47SuY0w+Sz2iUfmd949y9LZXvSHxAX1KPSMNl0Jk7 roXAj8xqmHaSNvDp8QqLOPsd/eO/NGK/Ehy6kylOmejQhyZ1XdHJNxaodxSQRmzG NfqNi+EVB2dnQ9qAJk9L9kgmvxKK4JM4PYcy5bLTaLcZiVEt5GLzMXHqiYOmQEno ouIxAH5yKDECtIlwQpZJHjon/OQ0XDhHZ6ohZQRmj1ruHUBfjJEl8H0Y5QvYzOer w6+EYFtdPCrZUCxaohTekHfcrK/GByPMEuWqO/wn7TgxNHSPnOVIxsKcW7VFZxbR Z59X9yP1v4gzFngKiWuq8xB5DogdUm/+OXCiDEvNmaWNk5MVqFjXSBbo2uHiSjIJ 64EUcV6KvHg0a5Lu8bCs2th/JT9LZL2vxrgpc4bOr1AbhfXsenLnWNwiEhm2c4fK 95F8wDdeEbCyiLPyVoZ0iRenxgEenEpQWnCPZa6IxIc7D4CmTMUbLEfXJ94pQKWq BGhiALEyBj6hUQQi6dZq =ajfZ -----END PGP SIGNATURE-----
diff --git a/debian/aide.conf.d/10_aide_hostname b/debian/aide.conf.d/10_aide_hostname
index 092e865..8a2c39e 100755
--- a/debian/aide.conf.d/10_aide_hostname
+++ b/debian/aide.conf.d/10_aide_hostname
@@ -17,3 +17,10 @@ fi
if [ -n "$(dpkg --print-architecture)" ]; then
echo "@@define ARCH $(dpkg --print-architecture)"
fi
+if [ -n "$(dpkg --print-foreign-architectures)" ]; then
+ if [ "$(dpkg --print-foreign-architectures | wc -l)" -gt 1 ]; then
+ echo "@@define FOREIGN_ARCHES $(dpkg --print-foreign-architectures | tr '\n' '|' | sed 's/^/(/; s/|$/)/')"
+ else
+ echo "@@define FOREIGN_ARCHES $(dpkg --print-foreign-architectures)"
+ fi
+fi
diff --git a/debian/aide.conf.d/31_aide_apt b/debian/aide.conf.d/31_aide_apt
index 89bcdf3..52d4dcc 100755
--- a/debian/aide.conf.d/31_aide_apt
+++ b/debian/aide.conf.d/31_aide_apt
@@ -34,6 +34,9 @@ cat $SOURCESLIST /dev/null | sed 's/ #.*$//' | while read deb uri dist comp; do
if [ "$deb" = "deb" ]; then
for c in $comp; do
echo "$LISTSDIR/${HOST}${HOSTPATH}_dists_${dist}_${c}_binary-@@{ARCH}_Packages(\.IndexDiff)?$ VarFile"
+ echo "@@ifdef FOREIGN_ARCHES"
+ echo "$LISTSDIR/${HOST}${HOSTPATH}_dists_${dist}_${c}_binary-@@{FOREIGN_ARCHES}_Packages(\.IndexDiff)?$ VarFile"
+ echo "@@endif"
echo "$LISTSDIR/${HOST}${HOSTPATH}_dists_${dist}_(InRelease|Release(\.gpg)?)$ VarFile"
echo "$LISTSDIR/${HOST}${HOSTPATH}_dists_${dist}_${c}_i18n_Translation-@@{TRANSLATIONS}(\.IndexDiff)?$ VarFile"
done
@@ -71,6 +74,9 @@ echo "/var/backups/apt\.extended_states\.6\.gz$ HiSerMemberLog"
if [ "$IGNORE_ARCHIVES" = "yes" ]; then
echo "!$ARCHIVESDIR/[-a-zA-Z0-9%\.~_+]+_(@@{ARCH}|all)\.deb$"
+ echo "@@ifdef FOREIGN_ARCHES"
+ echo "!$ARCHIVESDIR/[-a-zA-Z0-9%\.~_+]+_@@{FOREIGN_ARCHES}\.deb$"
+ echo "@@endif"
fi
if [ "$IGNORE_FRQCHG" = "yes" ]; then
diff --git a/debian/aide.conf.d/31_aide_apt-file b/debian/aide.conf.d/31_aide_apt-file
index f61f60f..88f03ba 100755
--- a/debian/aide.conf.d/31_aide_apt-file
+++ b/debian/aide.conf.d/31_aide_apt-file
@@ -9,6 +9,9 @@ cat $SOURCESLIST /dev/null | sed 's/ #.*$//' | while read deb uri dist comp; do
if [ "$PROTOCOL" = "http" ] || [ "$PROTOCOL" = "ftp" ]; then
for c in $comp; do
echo "/var/cache/apt/apt-file/"${HOST//\./\\\.}${HOSTPATH}"_dists_"${dist//\//_}"_"${c}"_Contents-@@{ARCH}\.(gz|IndexDiff)$ VarFile"
+ echo "@@ifdef FOREIGN_ARCHES"
+ echo "/var/cache/apt/apt-file/"${HOST//\./\\\.}${HOSTPATH}"_dists_"${dist//\//_}"_"${c}"_Contents-@@{FOREIGN_ARCHES}\.(gz|IndexDiff)$ VarFile"
+ echo "@@endif"
done
fi
done
aide-multiarch-detection.patch.sig
Description: PGP signature
