daily autocommit

diff --git a/.etckeeper b/.etckeeper
index d7d01720ec64393833147c6bfd3af063d55c6e6d..2e1505c7e9a16fff139ead635f72da937255ace4 100755 (executable)
--- a/.etckeeper
+++ b/.etckeeper
@@ -1499,6 +1499,10 @@ maybe chgrp 'lp' 'cups/ppd/ar-hp-HP-LaserJet-M806.ppd'
 maybe chmod 0640 'cups/ppd/ar-hp-HP-LaserJet-M806.ppd'
 maybe chgrp 'lp' 'cups/ppd/ar-hp-HP-LaserJet-M806.ppd.O'
 maybe chmod 0640 'cups/ppd/ar-hp-HP-LaserJet-M806.ppd.O'
+maybe chgrp 'lp' 'cups/ppd/hp8.ppd'
+maybe chmod 0640 'cups/ppd/hp8.ppd'
+maybe chgrp 'lp' 'cups/ppd/hp_LaserJet_9040_8BFB3E_.ppd'
+maybe chmod 0640 'cups/ppd/hp_LaserJet_9040_8BFB3E_.ppd'
 maybe chgrp 'lp' 'cups/printers.conf.O'
 maybe chmod 0600 'cups/printers.conf.O'
 maybe chmod 0644 'cups/raw.convs'

diff --git a/cups/ppd/hp8.ppd b/cups/ppd/hp8.ppd
new file mode 100644 (file)
index 0000000..bfe3ed1
--- /dev/null
+++ b/cups/ppd/hp8.ppd
@@ -0,0 +1,100 @@
+*PPD-Adobe: "4.3"
+*FormatVersion: "4.3"
+*FileVersion: "1.27.4"
+*LanguageVersion: English
+*LanguageEncoding: ISOLatin1
+*PSVersion: "(3010.000) 0"
+*LanguageLevel: "3"
+*FileSystem: False
+*PCFileName: "drvless.ppd"
+*Manufacturer: "hp"
+*ModelName: "hp LaserJet 9040"
+*Product: "(hp LaserJet 9040)"
+*NickName: "hp LaserJet 9040, driverless, cups-filters 1.27.4"
+*ShortNickName: "hp LaserJet 9040"
+*DefaultOutputOrder: Normal
+*ColorDevice: True
+*cupsVersion: 2.3
+*cupsSNMPSupplies: False
+*cupsLanguages: "en"
+*cupsFilter2: "application/vnd.cups-postscript application/postscript 500 -"
+*cupsFilter2: "application/vnd.cups-raster application/vnd.hp-pcl 700 rastertopclx"
+*% Printer did not supply page size info via IPP, using defaults
+*OpenUI *PageSize/Media Size: PickOne
+*OrderDependency: 10 AnySetup *PageSize
+*DefaultPageSize: Letter
+*PageSize Letter/US Letter: "<</PageSize[612 792]>>setpagedevice"
+*PageSize Legal/US Legal: "<</PageSize[612 1008]>>setpagedevice"
+*PageSize Executive/Executive: "<</PageSize[522 756]>>setpagedevice"
+*PageSize Tabloid/Tabloid: "<</PageSize[792 1224]>>setpagedevice"
+*PageSize A3/A3: "<</PageSize[842 1191]>>setpagedevice"
+*PageSize A4/A4: "<</PageSize[595 842]>>setpagedevice"
+*PageSize A5/A5: "<</PageSize[420 595]>>setpagedevice"
+*PageSize B5/JIS B5: "<</PageSize[516 729]>>setpagedevice"
+*PageSize EnvISOB5/Envelope B5: "<</PageSize[499 709]>>setpagedevice"
+*PageSize Env10/Envelope #10 : "<</PageSize[297 684]>>setpagedevice"
+*PageSize EnvC5/Envelope C5: "<</PageSize[459 649]>>setpagedevice"
+*PageSize EnvDL/Envelope DL: "<</PageSize[312 624]>>setpagedevice"
+*PageSize EnvMonarch/Envelope Monarch: "<</PageSize[279 540]>>setpagedevice"
+*CloseUI: *PageSize
+*OpenUI *PageRegion/Media Size: PickOne
+*OrderDependency: 10 AnySetup *PageRegion
+*DefaultPageRegion: Letter
+*PageRegion Letter/US Letter: "<</PageSize[612 792]>>setpagedevice"
+*PageRegion Legal/US Legal: "<</PageSize[612 1008]>>setpagedevice"
+*PageRegion Executive/Executive: "<</PageSize[522 756]>>setpagedevice"
+*PageRegion Tabloid/Tabloid: "<</PageSize[792 1224]>>setpagedevice"
+*PageRegion A3/A3: "<</PageSize[842 1191]>>setpagedevice"
+*PageRegion A4/A4: "<</PageSize[595 842]>>setpagedevice"
+*PageRegion A5/A5: "<</PageSize[420 595]>>setpagedevice"
+*PageRegion B5/JIS B5: "<</PageSize[516 729]>>setpagedevice"
+*PageRegion EnvISOB5/Envelope B5: "<</PageSize[499 709]>>setpagedevice"
+*PageRegion Env10/Envelope #10 : "<</PageSize[297 684]>>setpagedevice"
+*PageRegion EnvC5/Envelope C5: "<</PageSize[459 649]>>setpagedevice"
+*PageRegion EnvDL/Envelope DL: "<</PageSize[312 624]>>setpagedevice"
+*PageRegion EnvMonarch/Envelope Monarch: "<</PageSize[279 540]>>setpagedevice"
+*CloseUI: *PageSize
+*DefaultImageableArea: Letter
+*ImageableArea Letter/US Letter: "18 12 594 780"
+*ImageableArea Legal/US Legal: "18 12 594 996"
+*ImageableArea Executive/Executive: "18 12 504 744"
+*ImageableArea Tabloid/Tabloid: "18 12 774 1212"
+*ImageableArea A3/A3: "18 12 824 1179"
+*ImageableArea A4/A4: "18 12 577 830"
+*ImageableArea A5/A5: "18 12 402 583"
+*ImageableArea B5/JIS B5: "18 12 498 717"
+*ImageableArea EnvISOB5/Envelope B5: "18 12 481 697"
+*ImageableArea Env10/Envelope #10 : "18 12 279 672"
+*ImageableArea EnvC5/Envelope C5: "18 12 441 637"
+*ImageableArea EnvDL/Envelope DL: "18 12 294 612"
+*ImageableArea EnvMonarch/Envelope Monarch: "18 12 261 528"
+*DefaultPaperDimension: Letter
+*PaperDimension Letter/US Letter: "612 792"
+*PaperDimension Legal/US Legal: "612 1008"
+*PaperDimension Executive/Executive: "522 756"
+*PaperDimension Tabloid/Tabloid: "792 1224"
+*PaperDimension A3/A3: "842 1191"
+*PaperDimension A4/A4: "595 842"
+*PaperDimension A5/A5: "420 595"
+*PaperDimension B5/JIS B5: "516 729"
+*PaperDimension EnvISOB5/Envelope B5: "499 709"
+*PaperDimension Env10/Envelope #10 : "297 684"
+*PaperDimension EnvC5/Envelope C5: "459 649"
+*PaperDimension EnvDL/Envelope DL: "312 624"
+*PaperDimension EnvMonarch/Envelope Monarch: "279 540"
+*OpenUI *ColorModel/Print Color Mode: PickOne
+*OrderDependency: 10 AnySetup *ColorModel
+*DefaultColorModel: Gray
+*ColorModel FastGray/Fast Grayscale: "<</cupsColorSpace 3/cupsBitsPerColor 1/cupsColorOrder 0/cupsCompression 0/ProcessColorModel /DeviceGray>>setpagedevice"
+*ColorModel Gray/Grayscale: "<</cupsColorSpace 18/cupsBitsPerColor 8/cupsColorOrder 0/cupsCompression 0/ProcessColorModel /DeviceGray>>setpagedevice"
+*ColorModel RGB/Color: "<</cupsColorSpace 19/cupsBitsPerColor 8/cupsColorOrder 0/cupsCompression 0/ProcessColorModel /DeviceRGB>>setpagedevice"
+*CloseUI: *ColorModel
+*OpenUI *Duplex/2-Sided Printing: PickOne
+*OrderDependency: 10 AnySetup *Duplex
+*DefaultDuplex: None
+*Duplex None/Off: "<</Duplex false>>setpagedevice"
+*Duplex DuplexNoTumble/On (Portrait): "<</Duplex true/Tumble false>>setpagedevice"
+*Duplex DuplexTumble/On (Landscape): "<</Duplex true/Tumble true>>setpagedevice"
+*CloseUI: *Duplex
+*DefaultResolution: 300dpi
+*cupsFilter2: "application/vnd.cups-pdf application/pdf 0 -"

diff --git a/cups/ppd/hp_LaserJet_9040_8BFB3E_.ppd b/cups/ppd/hp_LaserJet_9040_8BFB3E_.ppd
new file mode 100644 (file)
index 0000000..bfe3ed1
--- /dev/null
+++ b/cups/ppd/hp_LaserJet_9040_8BFB3E_.ppd
@@ -0,0 +1,100 @@
+*PPD-Adobe: "4.3"
+*FormatVersion: "4.3"
+*FileVersion: "1.27.4"
+*LanguageVersion: English
+*LanguageEncoding: ISOLatin1
+*PSVersion: "(3010.000) 0"
+*LanguageLevel: "3"
+*FileSystem: False
+*PCFileName: "drvless.ppd"
+*Manufacturer: "hp"
+*ModelName: "hp LaserJet 9040"
+*Product: "(hp LaserJet 9040)"
+*NickName: "hp LaserJet 9040, driverless, cups-filters 1.27.4"
+*ShortNickName: "hp LaserJet 9040"
+*DefaultOutputOrder: Normal
+*ColorDevice: True
+*cupsVersion: 2.3
+*cupsSNMPSupplies: False
+*cupsLanguages: "en"
+*cupsFilter2: "application/vnd.cups-postscript application/postscript 500 -"
+*cupsFilter2: "application/vnd.cups-raster application/vnd.hp-pcl 700 rastertopclx"
+*% Printer did not supply page size info via IPP, using defaults
+*OpenUI *PageSize/Media Size: PickOne
+*OrderDependency: 10 AnySetup *PageSize
+*DefaultPageSize: Letter
+*PageSize Letter/US Letter: "<</PageSize[612 792]>>setpagedevice"
+*PageSize Legal/US Legal: "<</PageSize[612 1008]>>setpagedevice"
+*PageSize Executive/Executive: "<</PageSize[522 756]>>setpagedevice"
+*PageSize Tabloid/Tabloid: "<</PageSize[792 1224]>>setpagedevice"
+*PageSize A3/A3: "<</PageSize[842 1191]>>setpagedevice"
+*PageSize A4/A4: "<</PageSize[595 842]>>setpagedevice"
+*PageSize A5/A5: "<</PageSize[420 595]>>setpagedevice"
+*PageSize B5/JIS B5: "<</PageSize[516 729]>>setpagedevice"
+*PageSize EnvISOB5/Envelope B5: "<</PageSize[499 709]>>setpagedevice"
+*PageSize Env10/Envelope #10 : "<</PageSize[297 684]>>setpagedevice"
+*PageSize EnvC5/Envelope C5: "<</PageSize[459 649]>>setpagedevice"
+*PageSize EnvDL/Envelope DL: "<</PageSize[312 624]>>setpagedevice"
+*PageSize EnvMonarch/Envelope Monarch: "<</PageSize[279 540]>>setpagedevice"
+*CloseUI: *PageSize
+*OpenUI *PageRegion/Media Size: PickOne
+*OrderDependency: 10 AnySetup *PageRegion
+*DefaultPageRegion: Letter
+*PageRegion Letter/US Letter: "<</PageSize[612 792]>>setpagedevice"
+*PageRegion Legal/US Legal: "<</PageSize[612 1008]>>setpagedevice"
+*PageRegion Executive/Executive: "<</PageSize[522 756]>>setpagedevice"
+*PageRegion Tabloid/Tabloid: "<</PageSize[792 1224]>>setpagedevice"
+*PageRegion A3/A3: "<</PageSize[842 1191]>>setpagedevice"
+*PageRegion A4/A4: "<</PageSize[595 842]>>setpagedevice"
+*PageRegion A5/A5: "<</PageSize[420 595]>>setpagedevice"
+*PageRegion B5/JIS B5: "<</PageSize[516 729]>>setpagedevice"
+*PageRegion EnvISOB5/Envelope B5: "<</PageSize[499 709]>>setpagedevice"
+*PageRegion Env10/Envelope #10 : "<</PageSize[297 684]>>setpagedevice"
+*PageRegion EnvC5/Envelope C5: "<</PageSize[459 649]>>setpagedevice"
+*PageRegion EnvDL/Envelope DL: "<</PageSize[312 624]>>setpagedevice"
+*PageRegion EnvMonarch/Envelope Monarch: "<</PageSize[279 540]>>setpagedevice"
+*CloseUI: *PageSize
+*DefaultImageableArea: Letter
+*ImageableArea Letter/US Letter: "18 12 594 780"
+*ImageableArea Legal/US Legal: "18 12 594 996"
+*ImageableArea Executive/Executive: "18 12 504 744"
+*ImageableArea Tabloid/Tabloid: "18 12 774 1212"
+*ImageableArea A3/A3: "18 12 824 1179"
+*ImageableArea A4/A4: "18 12 577 830"
+*ImageableArea A5/A5: "18 12 402 583"
+*ImageableArea B5/JIS B5: "18 12 498 717"
+*ImageableArea EnvISOB5/Envelope B5: "18 12 481 697"
+*ImageableArea Env10/Envelope #10 : "18 12 279 672"
+*ImageableArea EnvC5/Envelope C5: "18 12 441 637"
+*ImageableArea EnvDL/Envelope DL: "18 12 294 612"
+*ImageableArea EnvMonarch/Envelope Monarch: "18 12 261 528"
+*DefaultPaperDimension: Letter
+*PaperDimension Letter/US Letter: "612 792"
+*PaperDimension Legal/US Legal: "612 1008"
+*PaperDimension Executive/Executive: "522 756"
+*PaperDimension Tabloid/Tabloid: "792 1224"
+*PaperDimension A3/A3: "842 1191"
+*PaperDimension A4/A4: "595 842"
+*PaperDimension A5/A5: "420 595"
+*PaperDimension B5/JIS B5: "516 729"
+*PaperDimension EnvISOB5/Envelope B5: "499 709"
+*PaperDimension Env10/Envelope #10 : "297 684"
+*PaperDimension EnvC5/Envelope C5: "459 649"
+*PaperDimension EnvDL/Envelope DL: "312 624"
+*PaperDimension EnvMonarch/Envelope Monarch: "279 540"
+*OpenUI *ColorModel/Print Color Mode: PickOne
+*OrderDependency: 10 AnySetup *ColorModel
+*DefaultColorModel: Gray
+*ColorModel FastGray/Fast Grayscale: "<</cupsColorSpace 3/cupsBitsPerColor 1/cupsColorOrder 0/cupsCompression 0/ProcessColorModel /DeviceGray>>setpagedevice"
+*ColorModel Gray/Grayscale: "<</cupsColorSpace 18/cupsBitsPerColor 8/cupsColorOrder 0/cupsCompression 0/ProcessColorModel /DeviceGray>>setpagedevice"
+*ColorModel RGB/Color: "<</cupsColorSpace 19/cupsBitsPerColor 8/cupsColorOrder 0/cupsCompression 0/ProcessColorModel /DeviceRGB>>setpagedevice"
+*CloseUI: *ColorModel
+*OpenUI *Duplex/2-Sided Printing: PickOne
+*OrderDependency: 10 AnySetup *Duplex
+*DefaultDuplex: None
+*Duplex None/Off: "<</Duplex false>>setpagedevice"
+*Duplex DuplexNoTumble/On (Portrait): "<</Duplex true/Tumble false>>setpagedevice"
+*Duplex DuplexTumble/On (Landscape): "<</Duplex true/Tumble true>>setpagedevice"
+*CloseUI: *Duplex
+*DefaultResolution: 300dpi
+*cupsFilter2: "application/vnd.cups-pdf application/pdf 0 -"

diff --git a/cups/printers.conf.O b/cups/printers.conf.O
index 03bc01c13766a3791506d90893d09f94c58a67fb..578c7217135051883f76b33a3c1db7c610457fe1 100644 (file)
--- a/cups/printers.conf.O
+++ b/cups/printers.conf.O
@@ -1,7 +1,7 @@
 # Printer configuration file for CUPS v2.3.1
 # Written by cupsd
 # DO NOT EDIT THIS FILE WHEN CUPSD IS RUNNING
-NextPrinterId 151
+NextPrinterId 157
 <Printer ar-hp-HP-LaserJet-M806>
 PrinterId 1
 UUID urn:uuid:e9b63086-a295-3d64-4799-24cf46be2061
@@ -85,7 +85,7 @@ Info HP Color LaserJet MFP M277dw
 MakeModel HP Color LaserJet Pro MFP M277 Postscript (recommended)
 DeviceURI socket://192.168.178.254
 State Idle
-StateTime 1599195408
+StateTime 1601314723
 ConfigTime 1590465380
 Type 8425500
 Accepting Yes
@@ -97,6 +97,69 @@ KLimit 0
 OpPolicy default
 ErrorPolicy retry-job
 </Printer>
+<Printer hp8>
+PrinterId 156
+UUID urn:uuid:1e7b7a3a-7fe9-3021-5c17-e7bcd3932da2
+Info 
+Location 
+MakeModel hp LaserJet 9040, driverless, cups-filters 1.27.4
+DeviceURI implicitclass://hp8/
+State Idle
+StateTime 1601360360
+ConfigTime 1601360360
+Type 8400988
+Accepting Yes
+Shared No
+JobSheets none none
+QuotaPeriod 0
+PageLimit 0
+KLimit 0
+OpPolicy default
+ErrorPolicy retry-job
+Option cups-browsed true
+</Printer>
+<Printer hp_LaserJet_9040_179A69_>
+PrinterId 154
+UUID urn:uuid:8cc348f0-15c4-30d2-648b-f2f4ba447a3a
+Info 
+Location 
+MakeModel hp LaserJet 9040, driverless, cups-filters 1.27.4
+DeviceURI implicitclass://hp_LaserJet_9040_179A69_/
+State Idle
+StateTime 1601360357
+ConfigTime 1601360357
+Type 8400988
+Accepting Yes
+Shared No
+JobSheets none none
+QuotaPeriod 0
+PageLimit 0
+KLimit 0
+OpPolicy default
+ErrorPolicy retry-job
+Option cups-browsed true
+</Printer>
+<Printer hp_LaserJet_9040_8BFB3E_>
+PrinterId 155
+UUID urn:uuid:78e1a86e-f5e2-331f-5ef1-b1844c1c4533
+Info 
+Location 
+MakeModel hp LaserJet 9040, driverless, cups-filters 1.27.4
+DeviceURI implicitclass://hp_LaserJet_9040_8BFB3E_/
+State Idle
+StateTime 1601360358
+ConfigTime 1601360358
+Type 8400988
+Accepting Yes
+Shared No
+JobSheets none none
+QuotaPeriod 0
+PageLimit 0
+KLimit 0
+OpPolicy default
+ErrorPolicy retry-job
+Option cups-browsed true
+</Printer>
 <Printer HP_LaserJet_M806_17B98C_>
 PrinterId 7
 UUID urn:uuid:b97fc042-5272-3bbc-7495-afb7cf437065

diff --git a/hosts b/hosts
index d053bb6820500283a0d910e844b476a6741680d2..daa1dbf97b898613782c4589267e49becc1056ed 100644 (file)
--- a/hosts
+++ b/hosts
@@ -97,3 +97,4 @@ ff02::2 ip6-allrouters
 10.110.1.69 erw-caps.ewerk.local erw-caps
 10.125.80.11 arn-caps.vums.local arn-caps
 #-- end managed zone --
+10.102.150.51 ems-scan08

diff --git a/mailcap b/mailcap
index 3d7665644615a696042cf78952a5e35806929644..9b3d659702dbcc83e9a5badb3398b463772ab6d1 100644 (file)
--- a/mailcap
+++ b/mailcap
@@ -266,6 +266,9 @@ x-scheme-handler/ftp; firefox -private-window %s; test=test -n "$DISPLAY"
 x-scheme-handler/chrome; firefox -private-window %s; test=test -n "$DISPLAY"
 video/webm; firefox -private-window %s; test=test -n "$DISPLAY"
 application/x-xpinstall; firefox -private-window %s; test=test -n "$DISPLAY"
+image/tiff; photoprint %s; test=test -n "$DISPLAY"
+image/jpeg; photoprint %s; test=test -n "$DISPLAY"
+image/png; photoprint %s; test=test -n "$DISPLAY"
 application/pkcs12; /usr/bin/gcr-viewer %s; test=test -n "$DISPLAY"
 application/pkcs12+pem; /usr/bin/gcr-viewer %s; test=test -n "$DISPLAY"
 application/pkcs7-mime; /usr/bin/gcr-viewer %s; test=test -n "$DISPLAY"