[Bug 760] faxrcvd corrupts communication logs

In some cases, quoted-printable encoding of emails sent by faxrcvd was
broken. This patch by Patrice Fournier and iFAX Solutions addresses that.
Thanks also to Lee Howard for valuable input into this issue!

diff --git a/CHANGES b/CHANGES
index 178be025898f0fb34078a01e54d5711165ceb844..c32943935e5214078b1da7e307090673e994bcf4 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -2,8 +2,9 @@
 
 Changelog
 
+* Fix quoted-printable MIME encoding in faxrcvd (BUG 760) (21 Apr 2006)
 * Fix sendfax to accept both destination and user subaddresses
-  (Bug 762) (21 Apr 2006)
+  (BUG 762) (21 Apr 2006)
 * Repair broken MMR from some Multitech modems (BUG 763) (21 Apr 2006)
 
 Changelog for HylaFAX 4.3.0rc1

diff --git a/util/faxrcvd.sh.in b/util/faxrcvd.sh.in
index ae8ff41d5687544c408558aee76797aaacbef333..8601969f125c6f39de5ad1e5c29da7ba64ba739b 100644 (file)
--- a/util/faxrcvd.sh.in
+++ b/util/faxrcvd.sh.in
@@ -187,6 +187,7 @@ if [ -f $FILE ]; then
            if [ -f log/c$COMMID ]; then
                $SED -e '/-- data/d' \
                 -e '/start.*timer/d' -e '/stop.*timer/d' \
+                -e 's/=/=3D/g' \
                 log/c$COMMID
            elif [ -n "$COMMID" ]; then
                echo "$DICTNOLOGAVAIL ($DICTCOMMID c$COMMID)."
@@ -228,6 +229,7 @@ if [ -f $FILE ]; then
            if [ -f log/c$COMMID ]; then
                $SED -e '/-- data/d' \
                     -e '/start.*timer/d' -e '/stop.*timer/d' \
+                    -e 's/=/=3D/g' \
                     log/c$COMMID
            elif [ -n "$COMMID" ]; then
                echo "$DICTNOLOGAVAIL ($DICTCOMMID c$COMMID)."
@@ -271,7 +273,10 @@ else
     #
     # Generate notification mail for a failed attempt.
     #
-    (echo "To: $TOADDR"
+    (echo "Mime-Version: 1.0"
+     echo "Content-Type: text/plain; charset=$CHARSET"
+     echo "Content-Transfer-Encoding: quoted-printable"
+     echo "To: $TOADDR"
      echo "From: $DICTRECEIVEAGENT <$FROMADDR>"
      echo "Subject: $DICTNOTRECEIVED"
      echo ""
@@ -284,7 +289,8 @@ else
      if [ -f log/c$COMMID ]; then
        $SED -e '/-- data/d' \
             -e '/start.*timer/d' -e '/stop.*timer/d' \
-           log/c$COMMID
+            -e 's/=/=3D/g' \
+            log/c$COMMID
      elif [ -n "$COMMID" ]; then
        echo "$DICTNOLOGAVAIL ($DICTCOMMID c$COMMID)."
      else