autu: Update to 7.0.2-1

3 files changed, 116 insertions, 11 deletions

diff --git a/.SRCINFO b/.SRCINFO
index ab7ff35bbae0..8a1ad19e0efa 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
 # Generated by mksrcinfo v8
-# Tue Dec 24 03:45:17 UTC 2019
+# Tue Jun 16 23:15:31 UTC 2020
 pkgbase = hylafaxplus
 	pkgdesc = Enterprise Fax Server
-	pkgver = 7.0.1
+	pkgver = 7.0.2
 	pkgrel = 1
 	url = http://hylafax.sourceforge.net/
 	install = hylafax.install
@@ -16,7 +16,7 @@ pkgbase = hylafaxplus
 	depends = sharutils
 	depends = jbigkit
 	depends = lcms2
-	depends = gsfonts-type1
+	depends = gawk
 	optdepends = smtp-server: email support
 	optdepends = avantfax: manage HylaFAX+ through web browser
 	optdepends = t38modem: sip/voip fax modem pool interface
@@ -26,9 +26,9 @@ pkgbase = hylafaxplus
 	optdepends = yajhfc: hylafax client in Java
 	optdepends = mainpine-rfuser: reset utility for MainPine modems
 	optdepends = tgif: Cover Page Customization
-	provides = hylafax=7.0.1
+	provides = hylafax=7.0.2
 	conflicts = hylafax
-	source = https://downloads.sourceforge.net/hylafax/hylafax-7.0.1.tar.gz
+	source = https://downloads.sourceforge.net/hylafax/hylafax-7.0.2.tar.gz
 	source = sendfaxvsi-1.0.0.tgz::https://github.com/severach/sendfaxvsi/archive/18fabc74490362cd26690331d546d727c727db25.tar.gz
 	source = fmfix.pl
 	source = localnxxtoregex.sh
@@ -40,7 +40,19 @@ pkgbase = hylafaxplus
 	source = 0005-hylafaxplus-faxsetup.patch
 	source = 0006-hylafaxplus-jobfmt-assigned-modem-to-used-modem.patch
 	source = 1000-hylafaxplus-modem-support.patch
-	sha256sums = 7f8b4cb081678ba5d11b336ba55fc203eb5a65752495555f77513ab7c1ac6f32
+	md5sums = b58793ab019aa1fe131557c14c35864e
+	md5sums = 3af38f1eaa4f9fb92cac2f0cf9544321
+	md5sums = 916f2c100eb2b41ef6b35f96bdb9444a
+	md5sums = c1d54ea1f50abfb3834488b428754714
+	md5sums = 0edd9dbf9b745437a5a4c174d6418e96
+	md5sums = a2d08cfd91be2aa608dd3bc9ef6c69bc
+	md5sums = c8c3aab59725c20eddc7d31d21c7b31e
+	md5sums = fd0395521f6c2b8681e5fbcfd943043d
+	md5sums = a14922b05223f703c41dff8035477706
+	md5sums = 0de848f554e2a93c09352eadb2b2e260
+	md5sums = f6692d5cb0033abe7865c47ec581ea87
+	md5sums = dd1e2859dd1cc13db863ba74bc539ca0
+	sha256sums = cbe9cd634bdc3a42d4aeec8b30c3b057b780a7255ef0f50d1efedef25fa87e9f
 	sha256sums = 0aed186ab30fdb7cf36895a0ff50b03bd4a68db63cf4f19763995dabd9caffb0
 	sha256sums = 466ab17cdaa1eb1f1f0b5bdc444a90df5835a1896b1363584264920bbc3929f2
 	sha256sums = 80d2e28ee7a7d8f93501e32c96e9895e242409da1326761d36dbf28e5a0e3677
diff --git a/PKGBUILD b/PKGBUILD
index 566133a88c9a..bc94d9c1a339 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -180,14 +180,14 @@ _opt_pagesize="Letter" # A4, Letter, Legal
 set -u
 pkgname='hylafaxplus'
 _pkgnick='hylafax'
-pkgver='7.0.1'
+pkgver='7.0.2'
 pkgrel='1'
 _sendfaxvsicommit='18fabc74490362cd26690331d546d727c727db25'
 pkgdesc='Enterprise Fax Server'
 arch=('i686' 'x86_64')
 url='http://hylafax.sourceforge.net/'
 license=('custom')
-depends=('dash' 'libtiff' 'pam' 'ghostscript' 'sharutils' 'jbigkit' 'lcms2' 'gsfonts-type1') # 'cron'
+depends=('dash' 'libtiff' 'pam' 'ghostscript' 'sharutils' 'jbigkit' 'lcms2' 'gawk') # 'gsfonts-type1') # 'cron'
 # BASE64 is the default so HylaFAX+ doesn't need uuencode but I put it in anyways to placate configure and the bin finder in faxsetup!
 optdepends=(
   'smtp-server: email support' # this must be configured if installed or Hylafax will spam the process table with orphaned sendmail processes
@@ -228,7 +228,19 @@ source=(
   '0006-hylafaxplus-jobfmt-assigned-modem-to-used-modem.patch'
   '1000-hylafaxplus-modem-support.patch'
 )
-sha256sums=('7f8b4cb081678ba5d11b336ba55fc203eb5a65752495555f77513ab7c1ac6f32'
+md5sums=('b58793ab019aa1fe131557c14c35864e'
+         '3af38f1eaa4f9fb92cac2f0cf9544321'
+         '916f2c100eb2b41ef6b35f96bdb9444a'
+         'c1d54ea1f50abfb3834488b428754714'
+         '0edd9dbf9b745437a5a4c174d6418e96'
+         'a2d08cfd91be2aa608dd3bc9ef6c69bc'
+         'c8c3aab59725c20eddc7d31d21c7b31e'
+         'fd0395521f6c2b8681e5fbcfd943043d'
+         'a14922b05223f703c41dff8035477706'
+         '0de848f554e2a93c09352eadb2b2e260'
+         'f6692d5cb0033abe7865c47ec581ea87'
+         'dd1e2859dd1cc13db863ba74bc539ca0')
+sha256sums=('cbe9cd634bdc3a42d4aeec8b30c3b057b780a7255ef0f50d1efedef25fa87e9f'
             '0aed186ab30fdb7cf36895a0ff50b03bd4a68db63cf4f19763995dabd9caffb0'
             '466ab17cdaa1eb1f1f0b5bdc444a90df5835a1896b1363584264920bbc3929f2'
             '80d2e28ee7a7d8f93501e32c96e9895e242409da1326761d36dbf28e5a0e3677'
@@ -783,7 +795,7 @@ Target = ghostscript
 [Action]
 Description = HylaFax+: Check for changed ghostscript font folder
 When = PostTransaction
-Exec = /usr/bin/bash /var/spool/hylafax/bin/ghostscript-upgrade.sh
+Exec = /usr/share/libalpm/scripts/hylafax-ghostscript-upgrade.sh
 EOF
   ) "${pkgdir}/usr/share/libalpm/hooks/hylafax-ghostscript.hook"
   install -Dm744 <(cat << EOF
@@ -806,7 +818,86 @@ if [ "\${EUID}" -eq 0 ]; then
   fi
 fi
 EOF
-  ) "${pkgdir}/var/spool/hylafax/bin/ghostscript-upgrade.sh"
+  ) "${pkgdir}/usr/share/libalpm/scripts/hylafax-ghostscript-upgrade.sh"
+
+  # pacman hooks to generate AFM files
+  install -Dm644 <(cat << EOF
+# Automatically generated by ${pkgname}-${pkgver} PKGBUILD from Arch Linux AUR
+# https://aur.archlinux.org/
+
+[Trigger]
+Operation = Upgrade
+Type = Package
+Target = ghostscript
+
+[Action]
+Description = HylaFax+: Generate Ghostscript Type 1 Font Metrics files
+When = PostTransaction
+Exec = /usr/share/libalpm/scripts/hylafax-ps2afm.sh build
+EOF
+  ) "${pkgdir}/usr/share/libalpm/hooks/hylafax-ghostscript-post.hook"
+  install -Dm644 <(cat << EOF
+# Automatically generated by ${pkgname}-${pkgver} PKGBUILD from Arch Linux AUR
+# https://aur.archlinux.org/
+
+[Trigger]
+Operation = Upgrade
+Type = Package
+Target = ghostscript
+
+[Action]
+Description = HylaFax+: Remove Ghostscript Type 1 Font Metrics files
+When = PreTransaction
+Exec = /usr/share/libalpm/scripts/hylafax-ps2afm.sh destroy
+EOF
+  ) "${pkgdir}/usr/share/libalpm/hooks/hylafax-ghostscript-pre.hook"
+  install -Dm744 <(cat << EOF
+#!/usr/bin/bash
+
+# Automatically generated by ${pkgname}-${pkgver} PKGBUILD from Arch Linux AUR
+# https://aur.archlinux.org/
+
+# build afm files for gs built in fonts at
+# /usr/share/ghostscript/*/Resource/Font
+# No more need for gsfonts-type1
+
+set -u
+set -e
+
+if [ "\${EUID}" -ne 0 ]; then
+  echo 'Must be root'
+  exit 1
+fi
+
+cd /usr/share/ghostscript/[0-9]*/Resource/Font
+
+_fn_build() {
+  local f fa fm
+  for f in *Mono*; do
+    if [ "\${f//./}" = "\${f}" ]; then
+      fa="\${f}.pfa"
+      fm="\${f}.afm"
+      ln -sf "\${f}" "\${fa}"
+      pf2afm "\${fa}" > /dev/null # supress .pfm message
+      rm "\${fa}"
+      sed -e 's:\r::g' -i "\${fm}"
+    fi
+  done
+}
+
+_fn_destroy() {
+  local f fa fm
+  for f in *Mono*; do
+    if [ "\${f//./}" = "\${f}" ]; then
+      fm="\${f}.afm"
+      rm "\${fm}"
+    fi
+  done
+}
+
+_fn_\${1:-build}
+EOF
+  ) "${pkgdir}/usr/share/libalpm/scripts/hylafax-ps2afm.sh"
 
   install -Dpm644 'COPYRIGHT' "${pkgdir}/usr/share/licenses/${_pkgnick}/COPYRIGHT"
   set +u
diff --git a/hylafax.install b/hylafax.install
index de9937652a7f..134fcc0dc679 100644
--- a/hylafax.install
+++ b/hylafax.install
@@ -30,6 +30,7 @@ post_install() {
   post_upgrade
   #usermod -d '/' "${_hyuser}" &>/dev/null
   _print_install
+  /usr/share/libalpm/scripts/hylafax-ps2afm.sh build
   mandb -q
   set +u
 }
@@ -120,6 +121,7 @@ pre_remove() {
 post_remove() {
   set -u
   systemctl daemon-reload
+  /usr/share/libalpm/scripts/hylafax-ps2afm.sh destroy
   mandb -q
   set +u
 }