smeserver-hylafax/contribs10/smeserver-hylafax-0.9-Add-mailfax-change-from-wiki-and-faxsetup-conf-additions.patch

diff -urN smeserver-hylafax-0.9.old/root/etc/e-smith/templates/etc/hylafax/hyla.conf/30faxsetup smeserver-hylafax-0.9/root/etc/e-smith/templates/etc/hylafax/hyla.conf/30faxsetup
--- smeserver-hylafax-0.9.old/root/etc/e-smith/templates/etc/hylafax/hyla.conf/30faxsetup       1970-01-01 01:00:00.000000000 +0100
+++ smeserver-hylafax-0.9/root/etc/e-smith/templates/etc/hylafax/hyla.conf/30faxsetup   2021-10-15 12:28:22.621387769 +0100
@@ -0,0 +1,3 @@
+# FontMap/FontPath added by faxsetup (Tue Oct 12 15:53:28 EEST 2021)
+FontMap:   /var/spool/hylafax/etc
+FontPath:  /usr/share/ghostscript/Resource/Init:/usr/share/ghostscript/lib:/usr/share/ghostscript/Resource/Font:/usr/share/ghostscript/fonts:/usr/share/fonts/urw-base35:/usr/share/ghostscript/conf.d/:/etc/ghostscript/:/usr/share/fonts:/usr/share/ghostscript/Resource/Init:/usr/share/ghostscript/lib:/usr/share/ghostscript/Resource/Font:/usr/share/ghostscript/fonts:/usr/share/fonts/urw-base35:/usr/share/ghostscript/conf.d/:/etc/ghostscript/:/usr/share/fonts
\ No newline at end of file
diff -urN smeserver-hylafax-0.9.old/root/var/spool/hylafax/etc/mailfax smeserver-hylafax-0.9/root/var/spool/hylafax/etc/mailfax
--- smeserver-hylafax-0.9.old/root/var/spool/hylafax/etc/mailfax        2021-10-15 11:42:29.799036536 +0100
+++ smeserver-hylafax-0.9/root/var/spool/hylafax/etc/mailfax    2021-10-15 12:29:53.982309475 +0100
@@ -7,6 +7,11 @@
 TMPVAR=${TMPVAR//\$\(/}
 SENDER=${TMPVAR//\)/}
 
-/usr/bin/faxmail -f Helvetica-Bold | /usr/bin/sendfax \
--f "$SENDER" \
--n -d "$EXT2@`/usr/bin/expr \"$HOST\" : '\(.*\)\.fax$'`"
+#/usr/bin/faxmail -f Helvetica-Bold | /usr/bin/sendfax \
+#-f "$SENDER" \
+#-n -d "$EXT2@`/usr/bin/expr \"$HOST\" : '\(.*\)\.fax$'`"
+
+/usr/bin/faxmail -s a4 \
+-n -u uucp "$EXT2@`/usr/bin/expr \"$HOST\" : '\(.*\)\.fax$'`" \
+"$SENDER"
+
1	brianr	1.1	diff -urN smeserver-hylafax-0.9.old/root/etc/e-smith/templates/etc/hylafax/hyla.conf/30faxsetup smeserver-hylafax-0.9/root/etc/e-smith/templates/etc/hylafax/hyla.conf/30faxsetup
2			--- smeserver-hylafax-0.9.old/root/etc/e-smith/templates/etc/hylafax/hyla.conf/30faxsetup 1970-01-01 01:00:00.000000000 +0100
3			+++ smeserver-hylafax-0.9/root/etc/e-smith/templates/etc/hylafax/hyla.conf/30faxsetup 2021-10-15 12:28:22.621387769 +0100
4			@@ -0,0 +1,3 @@
5			+# FontMap/FontPath added by faxsetup (Tue Oct 12 15:53:28 EEST 2021)
6			+FontMap: /var/spool/hylafax/etc
7			+FontPath: /usr/share/ghostscript/Resource/Init:/usr/share/ghostscript/lib:/usr/share/ghostscript/Resource/Font:/usr/share/ghostscript/fonts:/usr/share/fonts/urw-base35:/usr/share/ghostscript/conf.d/:/etc/ghostscript/:/usr/share/fonts:/usr/share/ghostscript/Resource/Init:/usr/share/ghostscript/lib:/usr/share/ghostscript/Resource/Font:/usr/share/ghostscript/fonts:/usr/share/fonts/urw-base35:/usr/share/ghostscript/conf.d/:/etc/ghostscript/:/usr/share/fonts
8			\ No newline at end of file
9			diff -urN smeserver-hylafax-0.9.old/root/var/spool/hylafax/etc/mailfax smeserver-hylafax-0.9/root/var/spool/hylafax/etc/mailfax
10			--- smeserver-hylafax-0.9.old/root/var/spool/hylafax/etc/mailfax 2021-10-15 11:42:29.799036536 +0100
11			+++ smeserver-hylafax-0.9/root/var/spool/hylafax/etc/mailfax 2021-10-15 12:29:53.982309475 +0100
12			@@ -7,6 +7,11 @@
13			TMPVAR=${TMPVAR//\$\(/}
14			SENDER=${TMPVAR//\)/}
15
16			-/usr/bin/faxmail -f Helvetica-Bold \| /usr/bin/sendfax \
17			--f "$SENDER" \
18			--n -d "$EXT2@`/usr/bin/expr \"$HOST\" : '\(.*\)\.fax$'`"
19			+#/usr/bin/faxmail -f Helvetica-Bold \| /usr/bin/sendfax \
20			+#-f "$SENDER" \
21			+#-n -d "$EXT2@`/usr/bin/expr \"$HOST\" : '\(.*\)\.fax$'`"
22			+
23			+/usr/bin/faxmail -s a4 \
24			+-n -u uucp "$EXT2@`/usr/bin/expr \"$HOST\" : '\(.*\)\.fax$'`" \
25			+"$SENDER"
26			+