autu: Update to 8.1601-2 Add UTAX TA option for future use

4 files changed, 95 insertions, 22 deletions

diff --git a/.SRCINFO b/.SRCINFO
index e1bc12552ee6..6cc8c808d7d3 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -2,7 +2,7 @@ pkgbase = kyocera-cups
 	pkgdesc = PPD drivers for Kyocera CS ECOSYS FS KM TASKalfa KPDL printers copiers wide format
 	pkgver = 8.1601
 	pkgrel = 2
-	url = https://usa.kyoceradocumentsolutions.com/en/products-services/hardware/printers/ecosys-fs-4200dn.html
+	url = https://www.kyoceradocumentsolutions.us/en/support/downloads.html
 	arch = i686
 	arch = x86_64
 	license = custom
@@ -10,10 +10,14 @@ pkgbase = kyocera-cups
 	conflicts = kyocera-ecosys-m2035dn
 	conflicts = kyocera-ecosys-p6035cdn
 	options = !strip
-	source = Kyocera_Linux_PPD_Ver_8.1601.tar.gz::https://www.kyoceradocumentsolutions.us/content/download-center-americas/us/drivers/drivers/Kyocera_Linux_PPD_Ver_8_1601_tar_gz.download.gz
+	source = https://la.kyoceradocumentsolutions.com/content/dam/kdc/kdag/downloads/technical/executables/drivers/kyoceradocumentsolutions/lad/en/Kyocera_Linux_PPD_Ver_8.1601.tar.gz
+	source = repack.sh
 	md5sums = 23228956c4f4df8a57dca10c9d783b59
+	md5sums = d3e7d0fe76377b0b058a9fb497cdfafa
 	sha1sums = ad7adba5e29464e9c3c1f052c6899d54f5afe0f4
+	sha1sums = cdb6d5622f9ca977ac178fb19553f5730096597b
 	sha256sums = 1375b67d4f79be0a02418cf8a03ea475e20ef92bf221fdb585f15a55c2d964e5
+	sha256sums = c0ca7dba26542a9b75b51300da289e753cfaa0f43b09c9230041ab5c728b49a4
 
 pkgname = kyocera-cups
 
diff --git a/PKGBUILD b/PKGBUILD
index e5044ebd9f20..762263f33c1b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -14,15 +14,19 @@
 # How to find driver (long pauses for page display)
 # Kyocera USA Download Center, Drivers, Product Category: All, Products: All, Technical Downloads: Drivers, Operating System: UNIX / LINUX
 
+# KyoceraLinuxPackages_20191115_tar.gz is a GUI addon that would be a separate package if anyone wanted it.
+
+_opt_UTAX=0
+
 set -u
 pkgname='kyocera-cups'
 pkgver='8.1601'
 pkgrel='2'
-#pkgdesc='PPD drivers for Kyocera CS ECOSYS FS KM TASKalfa KPDL and UTAX TA Triumph Adler printers copiers wide format'
 pkgdesc='PPD drivers for Kyocera CS ECOSYS FS KM TASKalfa KPDL printers copiers wide format'
 arch=('i686' 'x86_64')
 # https://www.kyoceradocumentsolutions.eu/index/products/product/fs4200dn.technical_specification.html (zip incomplete PPD list)
-url='https://usa.kyoceradocumentsolutions.com/en/products-services/hardware/printers/ecosys-fs-4200dn.html' # (.tar.gz complete PPD list)
+#url='https://usa.kyoceradocumentsolutions.com/en/products-services/hardware/printers/ecosys-fs-4200dn.html' # (.tar.gz complete PPD list)
+url='https://www.kyoceradocumentsolutions.us/en/support/downloads.html' # select FS-4200dn
 license=('custom')
 depends=('cups')
 conflicts=('kyocera-ecosys-m2035dn' 'kyocera-ecosys-p6035cdn')
@@ -32,19 +36,35 @@ options=('!strip')
 #source=("https://cdn.kyostatics.net/dlc/eu/driver/all/linux_8_1602_ecosys.-downloadcenteritem-Single-File.downloadcenteritem.tmp/Linux_8.1602_EC..._P5021_5026.zip")
 #source=("https://usa.kyoceradocumentsolutions.com/content/dam/kdc/kdag/downloads/technical/executables/drivers/kyoceradocumentsolutions/us/en/Kyocera_Linux_PPD_Ver_${pkgver}.tar.gz")
 _srcdir="Kyocera_Linux_PPD_Ver_${pkgver}.tar.gz"
-source=("${_srcdir}::https://www.kyoceradocumentsolutions.us/content/download-center-americas/us/drivers/drivers/${_srcdir//./_}.download.gz")
-md5sums=('23228956c4f4df8a57dca10c9d783b59')
-sha1sums=('ad7adba5e29464e9c3c1f052c6899d54f5afe0f4')
-sha256sums=('1375b67d4f79be0a02418cf8a03ea475e20ef92bf221fdb585f15a55c2d964e5')
+#source=("${_srcdir}::https://www.kyoceradocumentsolutions.us/content/download-center-americas/us/drivers/drivers/${_srcdir//./_}.download.gz")
+source=("https://la.kyoceradocumentsolutions.com/content/dam/kdc/kdag/downloads/technical/executables/drivers/kyoceradocumentsolutions/lad/en/Kyocera_Linux_PPD_Ver_${pkgver}.tar.gz")
+md5sums=('23228956c4f4df8a57dca10c9d783b59'
+         'd3e7d0fe76377b0b058a9fb497cdfafa')
+sha1sums=('ad7adba5e29464e9c3c1f052c6899d54f5afe0f4'
+          'cdb6d5622f9ca977ac178fb19553f5730096597b')
+sha256sums=('1375b67d4f79be0a02418cf8a03ea475e20ef92bf221fdb585f15a55c2d964e5'
+            'c0ca7dba26542a9b75b51300da289e753cfaa0f43b09c9230041ab5c728b49a4')
+
+source+=('repack.sh')
 
 #_uagent='Mozilla'
 #_uagent='Mozilla/5.0 (X11; Linux x86_64; rv:63.0) Gecko/20100101 Firefox/63.0'
 #DLAGENTS=("${DLAGENTS[@]//curl -/curl -A '${_uagent}' -}")
 
+if [ "${_opt_UTAX}" -ne 0 ]; then
+  pkgdesc='PPD drivers for Kyocera CS ECOSYS FS KM TASKalfa KPDL and UTAX TA Triumph Adler printers copiers wide format'
+  source+=('TALinuxPackages-20141229-Repack.7z')
+  md5sums+=('5426711f3aac491c49dadcf420207b4b')
+  sha1sums+=('8d1251d95f576c2e834e8c71b9840da54202db2b')
+  sha256sums+=('8eedb636fbbb208b45dc355a795237d946141d00c63f3fe1fc96c4614070e01a')
+  conflicts+=('kyocera-utax-ta')
+fi
+
+declare -gA _bittage=([i686]='32bit' [x86_64]='64bit')
+
 prepare() {
   set -u
   # Set number of bits: '32bit' or '64bit', depending on ${CARCH}
-  declare -A _bittage=([i686]='32bit' [x86_64]='64bit')
   declare -A _suffix=([i686]='i386' [x86_64]='amd64')
 
   # Set language name: Default is English
@@ -58,6 +78,37 @@ prepare() {
   set +u
 }
 
+_package_UTAX() {
+  set -u
+  if [ -d 'LinuxPackagesTA' ]; then # _opt_UTAX
+    cd 'LinuxPackagesTA'
+    # Set language name: Default is English
+    # Valid options are: English, French, German, Italian, Portuguese, Spanish
+    # Options are result of `ls LinuxPackagesTA/${_bittage}/Global`
+    local _language='English'
+
+    # LICENSES.txt documents are identical, copy only one of them:
+    install -Dm644 'LICENSES.txt' "${pkgdir}/usr/share/licenses/${pkgname}/LICENSES-UTAX.txt"
+
+    # Install TA PPDs
+    install -Dm644 "${_bittage[${CARCH}]}/Global/${_language}/PPDs"/*.[pP][pP][dD] -t "${pkgdir}/usr/share/cups/model/UTAX_TA"
+
+    local _f1 _f2
+    for _f1 in "${pkgdir}/usr/share/cups/model"/*/*.[pP][pP][dD]; do
+      _f2="${_f1// /_}"
+      _f2="${_f2/.PPD/.ppd}"
+      if [ "${_f1}" != "${_f2}" ]; then
+        mv "${_f1}" "${_f2}"
+      fi
+    done
+
+    # kyofilter_C programs are identical for a given bittage, copy only one of them:
+    install -Dm755 "${_bittage[${CARCH}]}/Global/${_language}/filter/kyofilter_C" -t "${pkgdir}/usr/lib/cups/filter"
+    cd ..
+  fi
+  set +u
+}
+
 package() {
   set -u
   # Install the package
@@ -74,6 +125,8 @@ package() {
     rm -r "${pkgdir}/usr/share/applications/" "${pkgdir}/usr/share/doc/" "${pkgdir}/usr/share/kyocera"
   fi
 
+  _package_UTAX
+
   # grep -he '^*ModelName:' "${pkgdir}/usr/share/cups/model/Kyocera"/*.ppd | sort -u > "${startdir}/models.${pkgver}.txt"
 
   # Compressing hinders package compression which results in a much larger package
diff --git a/kyocera-cups.install b/kyocera-cups.install
deleted file mode 100644
index 48b3993bf5b0..000000000000
--- a/kyocera-cups.install
+++ /dev/null
@@ -1,13 +0,0 @@
-post_install() {
-  echo "Restarting CUPS server"
-  systemctl restart org.cups.cupsd.service
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  post_install
-}
-
diff --git a/repack.sh b/repack.sh
new file mode 100644
index 000000000000..6a5d89a3835c
--- /dev/null
+++ b/repack.sh
@@ -0,0 +1,29 @@
+#!/usr/bin/bash
+
+# The Kyocera and UTAX PPD are redistributable by MIT license.
+# All old Kyocera models are in the new package. We only need the UTAX TA models.
+# The filter does not say if it is redistributable or not
+# so we'll treat it with the same license as the PPD files that use it.
+
+# Let's repack them without the files we don't use.
+
+set -e
+set -u
+
+rm -rf 'repack.dir'
+mkdir 'repack.dir'
+cd 'repack.dir'
+bsdtar -xf '../Kyocera Linux PPD Ver 8.1404.tar.gz'
+cd 'Kyocera Linux PPD Ver 8.1404'
+bsdtar -C '..' -xf 'TALinuxPackages-20141229.tar.gz'
+cd '../LinuxPackagesTA'
+if :; then
+  find . -depth -type 'd' -name 'bintools' -exec rm -r '{}' ';'
+  find . -type 'f' -name 'install.sh' -delete
+fi
+cd ..
+# https://stackoverflow.com/questions/27457326/compressing-a-folder-with-many-duplicated-files
+# This never produces the same md5 twice
+# Almost comical how small this file really can be
+7za a -r -t7z -m0=lzma2 -mx=9 -mfb=273 -md=29 -ms=8g -mmt=off -mmtf=off -mqs=on -bt -bb3 'TALinuxPackages-20141229-Repack.7z' 'LinuxPackagesTA'
+7z t 'TALinuxPackages-20141229-Repack.7z'