diff --git a/1x1spacer.gif b/1x1spacer.gif deleted file mode 100644 index c0b332e..0000000 Binary files a/1x1spacer.gif and /dev/null differ diff --git a/Build.debian b/Build.debian index 8118206..adace3b 100755 --- a/Build.debian +++ b/Build.debian @@ -108,7 +108,6 @@ mkdir -p $WORK/usr/share/MailScanner/doc cp $DEVBASEDIR/changelog $WORK/usr/share/MailScanner/doc/ cp $DEVBASEDIR/LICENSE $WORK/usr/share/MailScanner/doc/ cp $DEVBASEDIR/README.md $WORK/usr/share/MailScanner/doc/ -cp $DEVBASEDIR/1x1spacer.gif $WORK/usr/share/MailScanner/doc/ fakeroot dpkg -b $WORK $PKGTMP/MailScanner-$VERSION.noarch.deb #chmod +x $PKGTMP/MailScanner-${FULLMSVER}/install.sh cd $PKGTMP diff --git a/Build.nix b/Build.nix index 5bbe584..1ad68db 100755 --- a/Build.nix +++ b/Build.nix @@ -49,7 +49,6 @@ cp -fr $DEVBASEDIR/common/* $WORK/ cp -fr $DEVBASEDIR/nix/* $WORK/ cp -fr $DEVBASEDIR/LICENSE $WORK/ cp -fr $DEVBASEDIR/README.md $WORK/ -cp -fr $DEVBASEDIR/1x1spacer.gif $WORK/ # Insert the version number we are building perl -pi -e 's/VersionNumberHere/'$MSVERSION'/;' $WORK/etc/MailScanner/MailScanner.conf diff --git a/changelog b/changelog index 39e4b1f..8598f82 100644 --- a/changelog +++ b/changelog @@ -2,7 +2,7 @@ ================================== - Remove default hosted 1x1spacer.gif -- Include sample 1x1spacer.gif in doc directory +- Include base64 encoded 1x1 spacer - Add missing file wrappers to packages 11/28/2021 Changes in v5.4.3-1 diff --git a/common/etc/MailScanner/MailScanner.conf b/common/etc/MailScanner/MailScanner.conf index d815fc7..fc23fac 100644 --- a/common/etc/MailScanner/MailScanner.conf +++ b/common/etc/MailScanner/MailScanner.conf @@ -1202,7 +1202,7 @@ Known Web Bug Servers = msgtag.com # If this is not specified, the the old value of "MailScannerWebBug" is used, # which of course is not an image and may well upset layout of the email. # This can also be the filename of a ruleset. -Web Bug Replacement = +Web Bug Replacement = data:image/gif;base64,R0lGODlhAQABAJEAAP///wAAAAAAAAAAACH5BAkAAAAALAAAAAABAAEAAAgEAAEEBAA7 # Do you want to allow or tags # in email messages? diff --git a/common/usr/sbin/ms-upgrade-conf b/common/usr/sbin/ms-upgrade-conf index ded091d..f7b16cf 100644 --- a/common/usr/sbin/ms-upgrade-conf +++ b/common/usr/sbin/ms-upgrade-conf @@ -290,10 +290,9 @@ while(<$newfh>) { delete $oldsettings{'webbugreplacement'}; print STDERR "Important Note\n--------------\n"; print STDERR "Web Bug Replacement (1x1 pixel spacer) has been removed\n"; - print STDERR "from pointing to our Amazon S3 in this version. Please host\n"; - print STDERR "your own copy of the 1x1spacer.gif for disarming web bugs. A\n"; - print STDERR "copy is included in this package for your convenience here:\n"; - print STDERR "/usr/share/MailScanner/doc/1x1spacer.gif or package base.\n"; + print STDERR "from pointing to our Amazon S3 in this version. A\n"; + print STDERR "base64 encoded spacer has been substituted and does not\n"; + print STDERR "require pointing to a URL\n"; print STDERR "\n"; sleep(5); } diff --git a/debian/DEBIAN/postinst b/debian/DEBIAN/postinst index eb25a90..0a84ea0 100644 --- a/debian/DEBIAN/postinst +++ b/debian/DEBIAN/postinst @@ -160,6 +160,13 @@ if [ -f /etc/MailScanner/MailScanner.conf.original -a -f /etc/MailScanner/MailSc cp -f /etc/MailScanner/MailScanner.conf ${SAVEDIR}/etc/MailScanner/MailScanner.new > /dev/null 2>&1 fi +# update web bug link +OLD="^Web Bug Replacement.*"; +NEW="Web Bug Replacement = data:image\/gif;base64,R0lGODlhAQABAJEAAP\/\/\/wAAAAAAAAAAACH5BAkAAAAALAAAAAABAAEAAAgEAAEEBAA7"; +if [ -f '/etc/MailScanner/MailScanner.conf' ]; then + sed -i "s/${OLD}/${NEW}/g" /etc/MailScanner/MailScanner.conf +fi + # fix reports directory OLDTHING='\/etc\/MailScanner\/reports'; NEWTHING='\/usr\/share\/MailScanner\/reports'; diff --git a/rhel/mailscanner.spec b/rhel/mailscanner.spec index 34d864c..0cd5352 100644 --- a/rhel/mailscanner.spec +++ b/rhel/mailscanner.spec @@ -271,7 +271,6 @@ done << EOF changelog README.md LICENSE -1x1spacer.gif EOF ### usr/lib/MailScanner @@ -519,6 +518,13 @@ if [ -f /etc/MailScanner/MailScanner.conf.original -a -f /etc/MailScanner/MailSc cp -f /etc/MailScanner/MailScanner.conf ${SAVEDIR}/etc/MailScanner/MailScanner.new > /dev/null 2>&1 fi +# update web bug link +OLD="^Web Bug Replacement.*"; +NEW="Web Bug Replacement = data:image\/gif;base64,R0lGODlhAQABAJEAAP\/\/\/wAAAAAAAAAAACH5BAkAAAAALAAAAAABAAEAAAgEAAEEBAA7"; +if [ -f '/etc/MailScanner/MailScanner.conf' ]; then + sed -i "s/${OLD}/${NEW}/g" /etc/MailScanner/MailScanner.conf +fi + # fix reports directory OLDTHING='\/etc\/MailScanner\/reports'; NEWTHING='\/usr\/share\/MailScanner\/reports'; @@ -791,7 +797,6 @@ exit 0 %attr(644,root,root) /usr/share/MailScanner/doc/changelog %attr(644,root,root) /usr/share/MailScanner/doc/LICENSE %attr(644,root,root) /usr/share/MailScanner/doc/README.md -%attr(644,root,root) /usr/share/MailScanner/doc/1x1spacer.gif %config(noreplace) /usr/share/MailScanner/reports/en/deleted.content.message.txt %config(noreplace) /usr/share/MailScanner/reports/en/stored.content.message.txt @@ -1275,6 +1280,9 @@ exit 0 %config(noreplace) /usr/share/MailScanner/reports/ca/stored.virus.message.txt %changelog +* Sat Jan 08 2022 Shawn Iverson +- Revert addition of 1x1spacer.gif in favor of base64 embedding + * Tue Jan 04 2022 Shawn Iverson - Remove 1x1spacer.gif default hosted url diff --git a/suse/mailscanner.spec b/suse/mailscanner.spec index 4cd7d42..57a2dcb 100644 --- a/suse/mailscanner.spec +++ b/suse/mailscanner.spec @@ -272,7 +272,6 @@ done << EOF changelog README.md LICENSE -1x1spacer.gif EOF ### usr/lib/MailScanner @@ -488,6 +487,13 @@ if [ -f /etc/MailScanner/MailScanner.conf.original -a -f /etc/MailScanner/MailSc cp -f /etc/MailScanner/MailScanner.conf ${SAVEDIR}/etc/MailScanner/MailScanner.new > /dev/null 2>&1 fi +# update web bug link +OLD="^Web Bug Replacement.*"; +NEW="Web Bug Replacement = data:image\/gif;base64,R0lGODlhAQABAJEAAP\/\/\/wAAAAAAAAAAACH5BAkAAAAALAAAAAABAAEAAAgEAAEEBAA7"; +if [ -f '/etc/MailScanner/MailScanner.conf' ]; then + sed -i "s/${OLD}/${NEW}/g" /etc/MailScanner/MailScanner.conf +fi + # fix reports directory OLDTHING='\/etc\/MailScanner\/reports'; NEWTHING='\/usr\/share\/MailScanner\/reports'; @@ -716,7 +722,6 @@ exit 0 %attr(644,root,root) /usr/share/MailScanner/doc/changelog %attr(644,root,root) /usr/share/MailScanner/doc/LICENSE %attr(644,root,root) /usr/share/MailScanner/doc/README.md -%attr(644,root,root) /usr/share/MailScanner/doc/1x1spacer.gif %config(noreplace) /usr/share/MailScanner/reports/en/deleted.content.message.txt %config(noreplace) /usr/share/MailScanner/reports/en/stored.content.message.txt @@ -1200,6 +1205,9 @@ exit 0 %config(noreplace) /usr/share/MailScanner/reports/ca/stored.virus.message.txt %changelog +* Sat Jan 08 2022 Shawn Iverson +- Revert addition of 1x1spacer.gif in favor of base64 embedding + * Tue Jan 04 2022 Shawn Iverson - Remove 1x1spacer.gif default hosted url