autu: Update to 4.0.11-1

2 files changed, 132 insertions, 19 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 75eae29af88f..9585c3cd3cdd 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
 pkgbase = canon-cque
 	pkgdesc = CUPS printer driver for Canon imagePRESS imageRUNNER ADVANCE PRO C iR i-SENSYS FAX LBP MF Laser Shot PC-D copier printers, may require PCL/PXL or PS dealer LMS license
-	pkgver = 4.0.10
+	pkgver = 4.0.11
 	pkgrel = 1
-	url = https://www.canon-europe.com/support/products/imagerunner/imagerunner-1730i.aspx
+	url = https://www.canon-europe.com/support/business/products/office-printers/imagerunner/series/imagerunner-1730i.html
 	arch = i686
 	arch = x86_64
 	license = custom
@@ -13,11 +13,11 @@ pkgbase = canon-cque
 	source = LICENSE
 	md5sums = 4df9593c184cd39bb9d9df6195c4d390
 	sha256sums = 343a624f559718d085b01605572fdf1cf33201931f06ef37567bbd497a29d333
-	source_i686 = https://files.canon-europe.com/files/soft45511/Software/cque-en-4.0-10.i386.rpm
-	md5sums_i686 = 84cf3ffd36a1ee155f88e471c581a132
-	sha256sums_i686 = c58a4e9048c24e51ac15d1a829d562c755479e3c63f8ab3f4020cd348d344205
-	source_x86_64 = https://files.canon-europe.com/files/soft45517/Software/cque-en-4.0-10.x86_64.rpm
-	md5sums_x86_64 = bf9ef148f334e1714820c8bcf663912c
-	sha256sums_x86_64 = 8790d6cd3d7ac2a261fb72270f9652cc55bb250ac84397cf8986335f2c8fd368
+	source_i686 = https://files.canon-europe.com/files/soft45511/Software/cque-en-4.0-11.i386.rpm
+	md5sums_i686 = 84e2f62ec4c9497c32217b704112747b
+	sha256sums_i686 = 67492f51606a920ba698e8abc7f9b3bad2eb5a00e4f1e2c7d653432c2ec22a60
+	source_x86_64 = https://files.canon-europe.com/files/soft45517/Software/cque-en-4.0-11.x86_64.rpm
+	md5sums_x86_64 = 70da4896d8fb7c8b3601554d35dd17eb
+	sha256sums_x86_64 = eb7930fd6d8679082dbb2207620d4fd322f65e3356beb942c567f195ba7c16aa
 
 pkgname = canon-cque
diff --git a/PKGBUILD b/PKGBUILD
index 80cc2878f151..653f9276d5a7 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,7 +5,7 @@
 # https://www.experts-exchange.com/questions/22609218/Canon-ImageRUNNER-3570-not-printing.html
 # http://www.copytechnet.com/forums/canon/82370-canon-ir-2530-driver-problem.html
 
-# models.4.0.9.txt
+# models.4.0.11.txt
 # ModelName: "Canon CLC4040-H1 Ver1.1 PCL"
 # ModelName: "Canon CLC4040-H1 PS Ver1.1"
 # ModelName: "Canon CLC5151-H1 Ver1.1 PCL"
@@ -81,6 +81,9 @@
 # ModelName: "Canon iR1435 PXL"
 # ModelName: "Canon iR1600-2000 PCL"
 # ModelName: "Canon iR1600-2000 PXL"
+# ModelName: "Canon iR1643 II Series PCL"
+# ModelName: "Canon iR1643 II Series PS"
+# ModelName: "Canon iR1643 II Series PXL"
 # ModelName: "Canon iR1643 Series PCL"
 # ModelName: "Canon iR1643P PCL"
 # ModelName: "Canon iR1643P PS"
@@ -135,15 +138,30 @@
 # ModelName: "Canon iR 2570C-C2570-F2 PS V1.0"
 # ModelName: "Canon iR 2570C EUR PCL"
 # ModelName: "Canon iR 2570C EUR PS"
+# ModelName: "Canon iR-ADV C259/359 PCL"
+# ModelName: "Canon iR-ADV C259/359 PS"
+# ModelName: "Canon iR-ADV C259/359 PXL"
 # ModelName: "Canon iR2625/2630 PCL"
 # ModelName: "Canon iR2625/2630 PS"
 # ModelName: "Canon iR2625/2630 PXL"
 # ModelName: "Canon iR2635/2645 PCL"
 # ModelName: "Canon iR2635/2645 PS"
 # ModelName: "Canon iR2635/2645 PXL"
+# ModelName: "Canon iR2725/2730 PCL"
+# ModelName: "Canon iR2725/2730 PS"
+# ModelName: "Canon iR2725/2730 PXL"
+# ModelName: "Canon iR2735/2745 PCL"
+# ModelName: "Canon iR2735/2745 PS"
+# ModelName: "Canon iR2735/2745 PXL"
 # ModelName: "Canon iR2830 PCL"
 # ModelName: "Canon iR2830 PS"
 # ModelName: "Canon iR2830 PXL"
+# ModelName: "Canon iR2925/2930 PCL"
+# ModelName: "Canon iR2925/2930 PS"
+# ModelName: "Canon iR2925/2930 PXL"
+# ModelName: "Canon iR2935/2945 PCL"
+# ModelName: "Canon iR2935/2945 PS"
+# ModelName: "Canon iR2935/2945 PXL"
 # ModelName: "Canon iR3025Ne PCL"
 # ModelName: "Canon iR3025Ne PS"
 # ModelName: "Canon iR3025Ne PXL"
@@ -183,6 +201,36 @@
 # ModelName: "Canon iR3570/iR4570 PCL"
 # ModelName: "Canon iR3570/iR4570 PS"
 # ModelName: "Canon iR3570/iR4570 PXL"
+# ModelName: "Canon iR-ADV C3922 PCL"
+# ModelName: "Canon iR-ADV C3922 PS"
+# ModelName: "Canon iR-ADV C3922 PXL"
+# ModelName: "Canon iR-ADV C3926 PCL"
+# ModelName: "Canon iR-ADV C3926 PS"
+# ModelName: "Canon iR-ADV C3926 PXL"
+# ModelName: "Canon iR-ADV C3930 PCL"
+# ModelName: "Canon iR-ADV C3930 PS"
+# ModelName: "Canon iR-ADV C3930 PXL"
+# ModelName: "Canon iR-ADV C3935 PCL"
+# ModelName: "Canon iR-ADV C3935 PS"
+# ModelName: "Canon iR-ADV C3935 PXL"
+# ModelName: "Canon iR-ADV 4825 PCL"
+# ModelName: "Canon iR-ADV 4825 PS"
+# ModelName: "Canon iR-ADV 4825 PXL"
+# ModelName: "Canon iR-ADV 4835 PCL"
+# ModelName: "Canon iR-ADV 4835 PS"
+# ModelName: "Canon iR-ADV 4835 PXL"
+# ModelName: "Canon iR-ADV 4845 PCL"
+# ModelName: "Canon iR-ADV 4845 PS"
+# ModelName: "Canon iR-ADV 4845 PXL"
+# ModelName: "Canon iR-ADV 4925 PCL"
+# ModelName: "Canon iR-ADV 4925 PS"
+# ModelName: "Canon iR-ADV 4925 PXL"
+# ModelName: "Canon iR-ADV 4935 PCL"
+# ModelName: "Canon iR-ADV 4935 PS"
+# ModelName: "Canon iR-ADV 4935 PXL"
+# ModelName: "Canon iR-ADV 4945 PCL"
+# ModelName: "Canon iR-ADV 4945 PS"
+# ModelName: "Canon iR-ADV 4945 PXL"
 # ModelName: "Canon iR5000-6000 PCL"
 # ModelName: "Canon iR5000-6000 PS"
 # ModelName: "Canon iR5000-6000 PXL"
@@ -207,6 +255,9 @@
 # ModelName: "Canon iR5075 PCL"
 # ModelName: "Canon iR5075 PS"
 # ModelName: "Canon iR5075 PXL"
+# ModelName: "Canon iR-ADV 529 PCL"
+# ModelName: "Canon iR-ADV 529 PS"
+# ModelName: "Canon iR-ADV 529 PXL"
 # ModelName: "Canon iR5570/iR6570 PCL"
 # ModelName: "Canon iR5570/iR6570 PS"
 # ModelName: "Canon iR5570/iR6570 PXL"
@@ -219,12 +270,21 @@
 # ModelName: "Canon iR 5880C/6880C EUR PCL"
 # ModelName: "Canon iR 5880C/6880C EUR PS"
 # ModelName: "Canon iR 5880C/6880C EUR PXL"
+# ModelName: "Canon iR-ADV 619 PCL"
+# ModelName: "Canon iR-ADV 619 PS"
+# ModelName: "Canon iR-ADV 619 PXL"
 # ModelName: "Canon iR 6800C EUR PCL"
 # ModelName: "Canon iR 6800C EUR PS"
+# ModelName: "Canon iR-ADV 6855/6860/6870 PCL"
+# ModelName: "Canon iR-ADV 6855/6860/6870 PS"
+# ModelName: "Canon iR-ADV 6855/6860/6870 PXL"
 # ModelName: "Canon iR 6870C-C6870-G1 V1.0 PCL"
 # ModelName: "Canon iR 6870C-C6870-G1 PS V1.0"
 # ModelName: "Canon iR 6870C EUR PCL"
 # ModelName: "Canon iR 6870C EUR PS"
+# ModelName: "Canon iR-ADV 6980 PCL"
+# ModelName: "Canon iR-ADV 6980 PS"
+# ModelName: "Canon iR-ADV 6980 PXL"
 # ModelName: "Canon iR7086-7105 PCL"
 # ModelName: "Canon iR7086-7105 PS"
 # ModelName: "Canon iR7086-7105 PXL"
@@ -234,6 +294,9 @@
 # ModelName: "Canon iR7086-7105-S2 Ver 1.0 PCL"
 # ModelName: "Canon iR7086-7105-S2 PS Ver 1.0"
 # ModelName: "Canon iR7086-7105-S2 Ver 1.0 PXL"
+# ModelName: "Canon iR-ADV 719 PCL"
+# ModelName: "Canon iR-ADV 719 PS"
+# ModelName: "Canon iR-ADV 719 PXL"
 # ModelName: "Canon iR7200 PCL"
 # ModelName: "Canon iR7200 PS"
 # ModelName: "Canon iR7200 PXL"
@@ -252,6 +315,12 @@
 # ModelName: "Canon iR85PLUS PXL"
 # ModelName: "Canon iR85 PS"
 # ModelName: "Canon iR85 PXL"
+# ModelName: "Canon iR-ADV 8905 PCL"
+# ModelName: "Canon iR-ADV 8905 PS"
+# ModelName: "Canon iR-ADV 8905 PXL"
+# ModelName: "Canon iR-ADV 8986/8995 PCL"
+# ModelName: "Canon iR-ADV 8986/8995 PS"
+# ModelName: "Canon iR-ADV 8986/8995 PXL"
 # ModelName: "Canon iR9070 PCL"
 # ModelName: "Canon iR9070 PS"
 # ModelName: "Canon iR9070 PXL"
@@ -627,6 +696,9 @@
 # ModelName: "Canon iR C3226 PCL"
 # ModelName: "Canon iR C3226 PS"
 # ModelName: "Canon iR C3226 PXL"
+# ModelName: "Canon iR C3326 PCL"
+# ModelName: "Canon iR C3326 PS"
+# ModelName: "Canon iR C3326 PXL"
 # ModelName: "Canon iR C3380-J1 Ver1.0 PCL"
 # ModelName: "Canon iR C3380-J1 PS Ver1.0"
 # ModelName: "Canon iR C3380 PCL"
@@ -655,6 +727,9 @@
 # ModelName: "Canon iR C5185 PCL"
 # ModelName: "Canon iR C5185 PS"
 # ModelName: "Canon iR C5185 PXL"
+# ModelName: "Canon i-SENSYS X C1946P PCL"
+# ModelName: "Canon i-SENSYS X C1946P PS"
+# ModelName: "Canon i-SENSYS X C1946P PXL"
 # ModelName: "Canon i-SENSYS X C1533P PCL"
 # ModelName: "Canon i-SENSYS X C1533P PS"
 # ModelName: "Canon i-SENSYS X C1533P PXL"
@@ -668,11 +743,23 @@
 # ModelName: "Canon LBP1127C / C1127P PCL"
 # ModelName: "Canon LBP1127C / C1127P PS"
 # ModelName: "Canon LBP1127C / C1127P PXL"
+# ModelName: "Canon LBP1238II/1238P/PrII PCL"
+# ModelName: "Canon LBP1238II/1238P/PrII PS"
+# ModelName: "Canon LBP1238II/1238P/PrII PXL"
 # ModelName: "Canon LBP1238 / 1238P/Pr PCL"
 # ModelName: "Canon LBP1238 / 1238P/Pr PS"
 # ModelName: "Canon LBP1238 / 1238P/Pr PXL"
+# ModelName: "Canon LBP1333C/C1333P PCL"
+# ModelName: "Canon LBP1333C/C1333P PS"
+# ModelName: "Canon LBP1333C/C1333P PXL"
 # ModelName: "Canon LBP151 PCL"
 # ModelName: "Canon LBP151 PXL"
+# ModelName: "Canon LBP1861 / 1861P PCL"
+# ModelName: "Canon LBP1861 / 1861P PS"
+# ModelName: "Canon LBP1861 / 1861P PXL"
+# ModelName: "Canon LBP1871 / 1871P PCL"
+# ModelName: "Canon LBP1871 / 1871P PS"
+# ModelName: "Canon LBP1871 / 1871P PXL"
 # ModelName: "Canon LBP212dw PCL"
 # ModelName: "Canon LBP212dw PXL"
 # ModelName: "Canon LBP214dw PCL"
@@ -689,6 +776,9 @@
 # ModelName: "Canon LBP228 PCL"
 # ModelName: "Canon LBP228 PS"
 # ModelName: "Canon LBP228 PXL"
+# ModelName: "Canon LBP236 PCL"
+# ModelName: "Canon LBP236 PS"
+# ModelName: "Canon LBP236 PXL"
 # ModelName: "Canon LBP251 PCL"
 # ModelName: "Canon LBP251 PXL"
 # ModelName: "Canon LBP252 PCL"
@@ -741,6 +831,9 @@
 # ModelName: "Canon LBP6680/3480 PCL"
 # ModelName: "Canon LBP6680/3480 PS"
 # ModelName: "Canon LBP6680/3480 PXL"
+# ModelName: "Canon LBP673C PCL"
+# ModelName: "Canon LBP673C PS"
+# ModelName: "Canon LBP673C PXL"
 # ModelName: "Canon LBP6750/3560 PCL"
 # ModelName: "Canon LBP6750/3560 PS"
 # ModelName: "Canon LBP6750/3560 PXL"
@@ -773,9 +866,15 @@
 # ModelName: "Canon MF1127C / C1127iF/i PCL"
 # ModelName: "Canon MF1127C / C1127iF/i PS"
 # ModelName: "Canon MF1127C / C1127iF/i PXL"
+# ModelName: "Canon MF1238II/1238iF/iII PCL"
+# ModelName: "Canon MF1238II/1238iF/iII PS"
+# ModelName: "Canon MF1238II/1238iF/iII PXL"
 # ModelName: "Canon MF1238 / 1238iF/i PCL"
 # ModelName: "Canon MF1238 / 1238iF/i PS"
 # ModelName: "Canon MF1238 / 1238iF/i PXL"
+# ModelName: "Canon MF1333C/C1333iF/i PCL"
+# ModelName: "Canon MF1333C/C1333iF/i PS"
+# ModelName: "Canon MF1333C/C1333iF/i PXL"
 # ModelName: "Canon MF249dw PCL"
 # ModelName: "Canon MF249dw PXL"
 # ModelName: "Canon MF411dw/416dw PCL"
@@ -793,6 +892,9 @@
 # ModelName: "Canon MF440 Series PCL"
 # ModelName: "Canon MF440 Series PS"
 # ModelName: "Canon MF440 Series PXL"
+# ModelName: "Canon MF453/MF455 PCL"
+# ModelName: "Canon MF453/MF455 PS"
+# ModelName: "Canon MF453/MF455 PXL"
 # ModelName: "Canon MF4660PL-4690PL PCL"
 # ModelName: "Canon MF4660PL-4690PL PXL"
 # ModelName: "Canon MF512x/515x PCL"
@@ -804,6 +906,9 @@
 # ModelName: "Canon MF540 Series PCL"
 # ModelName: "Canon MF540 Series PS"
 # ModelName: "Canon MF540 Series PXL"
+# ModelName: "Canon MF552/MF553 PCL"
+# ModelName: "Canon MF552/MF553 PS"
+# ModelName: "Canon MF552/MF553 PXL"
 # ModelName: "Canon MF5880/MF5840 PCL"
 # ModelName: "Canon MF5880/MF5840 PXL"
 # ModelName: "Canon MF5940dn PCL"
@@ -852,6 +957,9 @@
 # ModelName: "Canon MF746C PCL"
 # ModelName: "Canon MF746C PS"
 # ModelName: "Canon MF746C PXL"
+# ModelName: "Canon MF752C/MF754C PCL"
+# ModelName: "Canon MF752C/MF754C PS"
+# ModelName: "Canon MF752C/MF754C PXL"
 # ModelName: "Canon MF832C PCL"
 # ModelName: "Canon MF832C PS"
 # ModelName: "Canon MF832C PXL"
@@ -876,37 +984,42 @@ pkgname='canon-cque'
 #_cnver='4.0-7'; _dl64r='45517'; _dl32r='45511'; _dl64d='45505'; _dl32d='45482'
 #_cnver='4.0-8'; _dl64r='45517'; _dl32r='45511'; _dl64d='45505'; _dl32d='45482'
 #_cnver='4.0-9'; _dl64r='45517'; _dl32r='45511'; _dl64d='45505'; _dl32d='45482'; _dl64t='48570'; _dl32t='48569'
-_cnver='4.0-10'; _dl64r='45517'; _dl32r='45511'; _dl64d='45505'; _dl32d='45482'; _dl64t='48570'; _dl32t='48569'
+#_cnver='4.0-10'; _dl64r='45517'; _dl32r='45511'; _dl64d='45505'; _dl32d='45482'; _dl64t='48570'; _dl32t='48569'
+_cnver='4.0-11'; _dl64r='45517'; _dl32r='45511'; _dl64d='45505'; _dl32d='45482'; _dl64t='48570'; _dl32t='48569'
 pkgver="${_cnver//-/.}"
 pkgrel='1'
 pkgdesc='CUPS printer driver for Canon imagePRESS imageRUNNER ADVANCE PRO C iR i-SENSYS FAX LBP MF Laser Shot PC-D copier printers, may require PCL/PXL or PS dealer LMS license'
 arch=('i686' 'x86_64')
-url='https://www.canon-europe.com/support/products/imagerunner/imagerunner-1730i.aspx'
+url='https://www.canon-europe.com/support/business/products/office-printers/imagerunner/series/imagerunner-1730i.html'
 license=('custom' 'GPL')
 depends=('cups' 'cups-filters')
 options=('!strip')
 source=('LICENSE')
 _srcdir="cque-en-${_cnver}"
-_flt="CQue_Linux_${_cnver//-/.}_64_EN"
+#_flt="CQue_Linux_${_cnver//-/.}_64_EN"
+_flt="cque-en-${_cnver}.x86_64"
 _flr="cque-en-${_cnver}.x86_64"
 _fld="cque-en-${_cnver}.x86_64"
 #source_x86_64=("https://files.canon-europe.com/files/soft01-${_dl64t}/Driver/${_flt}.tar.gz")
 source_x86_64=("https://files.canon-europe.com/files/soft${_dl64r}/Software/${_flr}.rpm")
 #source_x86_64=("https://files.canon-europe.com/files/soft${_dl64d}/Driver/${_fld}.deb")
-_flt="${_flt//64/32}"
-_flt="CQue_v${_cnver//-/.}_Linux_32_EN"
+#_flt="${_flt//64/32}"
+_flt="${_flt//x86_64/i386}"
 _flr="${_flr//x86_64/i386}"
-_fld="${_fld//x86_64/i386}"
+#_fld="${_fld//x86_64/i386}"
+_fld="Cque_${_cnver//-/.}_Linux_32_EN"
 #source_i686=("https://files.canon-europe.com/files/soft01-${_dl32t}/Driver/${_flt}.tar.gz")
 source_i686=("https://files.canon-europe.com/files/soft${_dl32r}/Software/${_flr}.rpm")
 #source_i686=("https://files.canon-europe.com/files/soft${_dl32d}/Software/${_fld}.deb")
 unset _fl
 md5sums=('4df9593c184cd39bb9d9df6195c4d390')
-md5sums_i686=('84cf3ffd36a1ee155f88e471c581a132')
-md5sums_x86_64=('bf9ef148f334e1714820c8bcf663912c')
+md5sums_i686=('84e2f62ec4c9497c32217b704112747b')
+md5sums_x86_64=('70da4896d8fb7c8b3601554d35dd17eb')
 sha256sums=('343a624f559718d085b01605572fdf1cf33201931f06ef37567bbd497a29d333')
-sha256sums_i686=('c58a4e9048c24e51ac15d1a829d562c755479e3c63f8ab3f4020cd348d344205')
-sha256sums_x86_64=('8790d6cd3d7ac2a261fb72270f9652cc55bb250ac84397cf8986335f2c8fd368')
+sha256sums_i686=('67492f51606a920ba698e8abc7f9b3bad2eb5a00e4f1e2c7d653432c2ec22a60')
+sha256sums_x86_64=('eb7930fd6d8679082dbb2207620d4fd322f65e3356beb942c567f195ba7c16aa')
+
+DLAGENTS=("${DLAGENTS[@]/curl /curl -k }")
 
 prepare() {
   set -u