$ diff -u oldfile newfile >patch

$ cvs diff -u filename

diff -u -r1.36 scripts_common.inc
--- scripts_common.inc  15 Feb 2009 20:01:03 -0000      1.36
+++ scripts_common.inc  2 May 2009 12:36:48 -0000
@@ -147,9 +147,9 @@
                        $ec_type = strtolower($m[4][$i]);

                        if ($ec_type == 'q') {
-                               $newval .= decode_string(str_replace('_', ' ', $m[5][$i]), 'quoted-printable');
+                               $newval .= decode_string(str_replace('_', ' ', $m[5][$i]), 'quoted-printable', $m[3][$i]);
                        } else if ($ec_type == 'b') {
-                               $newval .= decode_string($m[5][$i], 'base64');
+                               $newval .= decode_string($m[5][$i], 'base64', $m[3][$i]);
                        }

                        if (!empty($m[5][$i])) {