diff --git a/print/hplip-plugin/Makefile b/print/hplip-plugin/Makefile index 59a955bbf5e01..fadb68ae1dc7a 100644 --- a/print/hplip-plugin/Makefile +++ b/print/hplip-plugin/Makefile @@ -1,5 +1,5 @@ PORTNAME= hplip-plugin -PORTVERSION= 3.23.8 +PORTVERSION= 3.23.12 CATEGORIES= print MASTER_SITES= https://developers.hp.com/sites/default/files/ DISTNAME= hplip-${DISTVERSION}-plugin @@ -17,7 +17,7 @@ LICENSE_PERMS= none ONLY_FOR_ARCHS= aarch64 amd64 i386 -RUN_DEPENDS= hp-plugin:print/hplip +RUN_DEPENDS= hplip>=${PORTVERSION}<${PORTVERSION:R}.$$((${PORTVERSION:E}+1)):print/hplip PORTSCOUT= ignore:1 diff --git a/print/hplip-plugin/distinfo b/print/hplip-plugin/distinfo index 2f852eb6f60b6..154aea73d17f6 100644 --- a/print/hplip-plugin/distinfo +++ b/print/hplip-plugin/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1695461275 -SHA256 (hplip-3.23.8-plugin.run) = 7ebb20c9eddfd0cdc7136b6b29195f16f3270c4c1efb3ef822e9827553eb7126 -SIZE (hplip-3.23.8-plugin.run) = 11491257 +TIMESTAMP = 1705143823 +SHA256 (hplip-3.23.12-plugin.run) = 402799c0c8e2efafc8452a5a0929b06efbfd7bee2ff8ce060bdc447b2a34067f +SIZE (hplip-3.23.12-plugin.run) = 11491524 diff --git a/print/hplip/Makefile b/print/hplip/Makefile index 0d022ca4609ce..d3b5e2bbbcfb7 100644 --- a/print/hplip/Makefile +++ b/print/hplip/Makefile @@ -1,6 +1,5 @@ PORTNAME= hplip -PORTVERSION= 3.23.8 -PORTREVISION= 1 +PORTVERSION= 3.23.12 CATEGORIES= print MASTER_SITES= SF diff --git a/print/hplip/distinfo b/print/hplip/distinfo index 9fac1b7fffc27..ddb808f3e6929 100644 --- a/print/hplip/distinfo +++ b/print/hplip/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1695460868 -SHA256 (hplip-3.23.8.tar.gz) = f7cc05f628c0cfd750e54ae41431c1dfdd29e97682f18b5c5ba5cb2c5b4b1b46 -SIZE (hplip-3.23.8.tar.gz) = 30121648 +TIMESTAMP = 1705139866 +SHA256 (hplip-3.23.12.tar.gz) = a76c2ac8deb31ddb5f0da31398d25ac57440928a0692dcb060a48daa718e69ed +SIZE (hplip-3.23.12.tar.gz) = 30162044 diff --git a/print/hplip/files/patch-prnt_hpps_hppsfilter.c b/print/hplip/files/patch-prnt_hpps_hppsfilter.c index 2b2db136b071a..c373172a81c33 100644 --- a/print/hplip/files/patch-prnt_hpps_hppsfilter.c +++ b/print/hplip/files/patch-prnt_hpps_hppsfilter.c @@ -9,12 +9,3 @@ if (fp == NULL) return; while (!feof (fp)) -@@ -105,7 +105,7 @@ static void open_tempbookletfile(char *mode) - if(ptempbooklet_file == NULL) - { - fprintf(stderr, "ERROR: Unable to open temp file %s\n", temp_filename); -- return 1; -+ return; - } - chmod(temp_filename, S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH); - diff --git a/print/hplip/files/patch-protocol_hp__ipp.c b/print/hplip/files/patch-protocol_hp__ipp.c deleted file mode 100644 index f25f08f888678..0000000000000 --- a/print/hplip/files/patch-protocol_hp__ipp.c +++ /dev/null @@ -1,46 +0,0 @@ ---- protocol/hp_ipp.c.orig 2023-09-13 04:07:44 UTC -+++ protocol/hp_ipp.c -@@ -108,9 +108,6 @@ int addCupsPrinter(char *name, char *device_uri, char - goto abort; - } - -- if ( info == NULL ) -- snprintf( info,sizeof(info), name ); -- - sprintf(printer_uri, "ipp://localhost/printers/%s", name); - - cupsSetUser("root"); -@@ -514,27 +511,27 @@ int __parsePrinterAttributes(ipp_t *response, printer_ - - if ( strcmp(attr_name, "printer-name") == 0 && - val_tag == IPP_TAG_NAME ) { -- snprintf(t_printer->name, sizeof(t_printer->name),ippGetString(attr, 0, NULL) ); -+ snprintf(t_printer->name, sizeof(t_printer->name), "%s", ippGetString(attr, 0, NULL) ); - } - else if ( strcmp(attr_name, "device-uri") == 0 && - val_tag == IPP_TAG_URI ) { -- snprintf(t_printer->device_uri,sizeof(t_printer->device_uri), ippGetString(attr, 0, NULL) ); -+ snprintf(t_printer->device_uri,sizeof(t_printer->device_uri), "%s", ippGetString(attr, 0, NULL) ); - } - else if ( strcmp(attr_name, "printer-uri-supported") == 0 && - val_tag == IPP_TAG_URI ) { -- snprintf(t_printer->printer_uri,sizeof(t_printer->printer_uri), ippGetString(attr, 0, NULL) ); -+ snprintf(t_printer->printer_uri,sizeof(t_printer->printer_uri), "%s", ippGetString(attr, 0, NULL) ); - } - else if ( strcmp(attr_name, "printer-info") == 0 && - val_tag == IPP_TAG_TEXT ) { -- snprintf(t_printer->info,sizeof(t_printer->info), ippGetString(attr, 0, NULL) ); -+ snprintf(t_printer->info,sizeof(t_printer->info), "%s", ippGetString(attr, 0, NULL) ); - } - else if ( strcmp(attr_name, "printer-location") == 0 && - val_tag == IPP_TAG_TEXT ) { -- snprintf(t_printer->location,sizeof(t_printer->location),ippGetString(attr, 0, NULL) ); -+ snprintf(t_printer->location,sizeof(t_printer->location), "%s", ippGetString(attr, 0, NULL) ); - } - else if ( strcmp(attr_name, "printer-make-and-model") == 0 && - val_tag == IPP_TAG_TEXT ) { -- snprintf(t_printer->make_model,sizeof(t_printer->make_model),ippGetString(attr, 0, NULL) ); -+ snprintf(t_printer->make_model,sizeof(t_printer->make_model), "%s", ippGetString(attr, 0, NULL) ); - } - else if ( strcmp(attr_name, "printer-state") == 0 && - val_tag == IPP_TAG_ENUM ) { diff --git a/print/hplip/pkg-plist b/print/hplip/pkg-plist index fe1db0d063d34..9fcf1c5a2dbf9 100644 --- a/print/hplip/pkg-plist +++ b/print/hplip/pkg-plist @@ -60,8 +60,8 @@ libexec/cups/filter/hpcups %%FAX%%libexec/cups/filter/hpcupsfax libexec/cups/filter/hpps libexec/cups/filter/pstotiff -%%X11%%share/applications/hplip.desktop %%X11%%share/applications/hp-uiscan.desktop +%%X11%%share/applications/hplip.desktop share/cups/drv/hpcups.drv %%FAX%%share/cups/mime/pstotiff.convs %%FAX%%share/cups/mime/pstotiff.types @@ -810,9 +810,8 @@ share/ppd/HP/hp-color_laserjet_flow_5800-ps.ppd.gz share/ppd/HP/hp-color_laserjet_flow_6800-ps.ppd.gz share/ppd/HP/hp-color_laserjet_flow_X579-ps.ppd.gz share/ppd/HP/hp-color_laserjet_flow_X57945-ps.ppd.gz +share/ppd/HP/hp-color_laserjet_flow_X580-ps.ppd.gz share/ppd/HP/hp-color_laserjet_flow_e57540-ps.ppd.gz -share/ppd/HP/hp-color_laserjet_flow_mfp_m680-ps.ppd.gz -share/ppd/HP/hp-color_laserjet_flow_mfp_m880-ps.ppd.gz share/ppd/HP/hp-color_laserjet_flow_e78625-ps.ppd.gz share/ppd/HP/hp-color_laserjet_flow_e78630-ps.ppd.gz share/ppd/HP/hp-color_laserjet_flow_e78635-ps.ppd.gz @@ -822,6 +821,8 @@ share/ppd/HP/hp-color_laserjet_flow_e87760-ps.ppd.gz share/ppd/HP/hp-color_laserjet_flow_e87770-ps.ppd.gz share/ppd/HP/hp-color_laserjet_flow_mfp_e786-ps.ppd.gz share/ppd/HP/hp-color_laserjet_flow_mfp_e877-ps.ppd.gz +share/ppd/HP/hp-color_laserjet_flow_mfp_m680-ps.ppd.gz +share/ppd/HP/hp-color_laserjet_flow_mfp_m880-ps.ppd.gz share/ppd/HP/hp-color_laserjet_flowmfp_m578-ps.ppd.gz share/ppd/HP/hp-color_laserjet_flowmfp_m776-ps.ppd.gz share/ppd/HP/hp-color_laserjet_m153-m154-ps.ppd.gz @@ -941,7 +942,6 @@ share/ppd/HP/hp-designjet_z2600_postscript-ps.ppd.gz share/ppd/HP/hp-designjet_z5200_postscript-ps.ppd.gz share/ppd/HP/hp-designjet_z5400-postscript.ppd.gz share/ppd/HP/hp-designjet_z5600_postscript-ps.ppd.gz -share/ppd/HP/hp-designjet_z6_pro_64in_ps-ps.ppd.gz share/ppd/HP/hp-designjet_z6100ps_42in_photo-ps.ppd.gz share/ppd/HP/hp-designjet_z6100ps_60in_photo-ps.ppd.gz share/ppd/HP/hp-designjet_z6200_42in_photo-ps.ppd.gz @@ -951,6 +951,7 @@ share/ppd/HP/hp-designjet_z6610ps_60in-ps.ppd.gz share/ppd/HP/hp-designjet_z6800_photo-postscript.ppd.gz share/ppd/HP/hp-designjet_z6810ps_42in-ps.ppd.gz share/ppd/HP/hp-designjet_z6810ps_60in-ps.ppd.gz +share/ppd/HP/hp-designjet_z6_pro_64in_ps-ps.ppd.gz share/ppd/HP/hp-designjet_z9_pro_64in_ps-ps.ppd.gz share/ppd/HP/hp-deskjet_1000_j110_series.ppd.gz share/ppd/HP/hp-deskjet_1010_series.ppd.gz @@ -1376,19 +1377,19 @@ share/ppd/HP/hp-laserjet_e60165-ps.ppd.gz share/ppd/HP/hp-laserjet_e60175-ps.ppd.gz share/ppd/HP/hp-laserjet_e62555-e62575-ps.ppd.gz share/ppd/HP/hp-laserjet_e62655-e62675-ps.ppd.gz -share/ppd/HP/hp-laserjet_flow_mfp_e52645-ps.ppd.gz -share/ppd/HP/hp-laserjet_flow_mfp_m525-ps.ppd.gz -share/ppd/HP/hp-laserjet_flow_mfp_m528-ps.ppd.gz -share/ppd/HP/hp-laserjet_flow_mfp_m630-ps.ppd.gz -share/ppd/HP/hp-laserjet_flow_mfp_m830-ps.ppd.gz share/ppd/HP/hp-laserjet_flow_e73130-ps.ppd.gz share/ppd/HP/hp-laserjet_flow_e73135-ps.ppd.gz share/ppd/HP/hp-laserjet_flow_e73140-ps.ppd.gz share/ppd/HP/hp-laserjet_flow_e82650-ps.ppd.gz share/ppd/HP/hp-laserjet_flow_e82660-ps.ppd.gz share/ppd/HP/hp-laserjet_flow_e82670-ps.ppd.gz +share/ppd/HP/hp-laserjet_flow_mfp_e52645-ps.ppd.gz share/ppd/HP/hp-laserjet_flow_mfp_e731-ps.ppd.gz share/ppd/HP/hp-laserjet_flow_mfp_e826-ps.ppd.gz +share/ppd/HP/hp-laserjet_flow_mfp_m525-ps.ppd.gz +share/ppd/HP/hp-laserjet_flow_mfp_m528-ps.ppd.gz +share/ppd/HP/hp-laserjet_flow_mfp_m630-ps.ppd.gz +share/ppd/HP/hp-laserjet_flow_mfp_m830-ps.ppd.gz share/ppd/HP/hp-laserjet_m1005.ppd.gz share/ppd/HP/hp-laserjet_m101-m106.ppd.gz share/ppd/HP/hp-laserjet_m109-m112.ppd.gz @@ -1438,8 +1439,19 @@ share/ppd/HP/hp-laserjet_mfp_e42540-ps.ppd.gz share/ppd/HP/hp-laserjet_mfp_e72425-ps.ppd.gz share/ppd/HP/hp-laserjet_mfp_e72430-ps.ppd.gz share/ppd/HP/hp-laserjet_mfp_e72525-25-30-35-ps.ppd.gz +share/ppd/HP/hp-laserjet_mfp_e730-ps.ppd.gz +share/ppd/HP/hp-laserjet_mfp_e73025-ps.ppd.gz +share/ppd/HP/hp-laserjet_mfp_e73030-ps.ppd.gz +share/ppd/HP/hp-laserjet_mfp_e731-ps.ppd.gz +share/ppd/HP/hp-laserjet_mfp_e73130-ps.ppd.gz +share/ppd/HP/hp-laserjet_mfp_e73135-ps.ppd.gz +share/ppd/HP/hp-laserjet_mfp_e73140-ps.ppd.gz share/ppd/HP/hp-laserjet_mfp_e77822-25-30-ps.ppd.gz share/ppd/HP/hp-laserjet_mfp_e82540-50-60-ps.ppd.gz +share/ppd/HP/hp-laserjet_mfp_e826-ps.ppd.gz +share/ppd/HP/hp-laserjet_mfp_e82650-ps.ppd.gz +share/ppd/HP/hp-laserjet_mfp_e82660-ps.ppd.gz +share/ppd/HP/hp-laserjet_mfp_e82670-ps.ppd.gz share/ppd/HP/hp-laserjet_mfp_e87640-50-60-ps.ppd.gz share/ppd/HP/hp-laserjet_mfp_m129-m134.ppd.gz share/ppd/HP/hp-laserjet_mfp_m139-m142.ppd.gz @@ -1454,17 +1466,6 @@ share/ppd/HP/hp-laserjet_mfp_m630-ps.ppd.gz share/ppd/HP/hp-laserjet_mfp_m631_m632_m633-ps.ppd.gz share/ppd/HP/hp-laserjet_mfp_m634_m635_m636-ps.ppd.gz share/ppd/HP/hp-laserjet_mfp_m725-ps.ppd.gz -share/ppd/HP/hp-laserjet_mfp_e730-ps.ppd.gz -share/ppd/HP/hp-laserjet_mfp_e73025-ps.ppd.gz -share/ppd/HP/hp-laserjet_mfp_e73030-ps.ppd.gz -share/ppd/HP/hp-laserjet_mfp_e731-ps.ppd.gz -share/ppd/HP/hp-laserjet_mfp_e73130-ps.ppd.gz -share/ppd/HP/hp-laserjet_mfp_e73135-ps.ppd.gz -share/ppd/HP/hp-laserjet_mfp_e73140-ps.ppd.gz -share/ppd/HP/hp-laserjet_mfp_e826-ps.ppd.gz -share/ppd/HP/hp-laserjet_mfp_e82650-ps.ppd.gz -share/ppd/HP/hp-laserjet_mfp_e82660-ps.ppd.gz -share/ppd/HP/hp-laserjet_mfp_e82670-ps.ppd.gz share/ppd/HP/hp-laserjet_p1005.ppd.gz share/ppd/HP/hp-laserjet_p1006.ppd.gz share/ppd/HP/hp-laserjet_p1007.ppd.gz @@ -1526,6 +1527,8 @@ share/ppd/HP/hp-laserjet_pro_m501dn-ps.ppd.gz share/ppd/HP/hp-laserjet_pro_m501n-ps.ppd.gz share/ppd/HP/hp-laserjet_pro_m701-ps.ppd.gz share/ppd/HP/hp-laserjet_pro_m706-ps.ppd.gz +share/ppd/HP/hp-laserjet_pro_mfp_3001-3008-ps.ppd.gz +share/ppd/HP/hp-laserjet_pro_mfp_3101-3108-ps.ppd.gz share/ppd/HP/hp-laserjet_pro_mfp_4101-ps.ppd.gz share/ppd/HP/hp-laserjet_pro_mfp_4102-ps.ppd.gz share/ppd/HP/hp-laserjet_pro_mfp_4103-ps.ppd.gz @@ -1555,8 +1558,7 @@ share/ppd/HP/hp-laserjet_pro_mfp_m27c.ppd.gz share/ppd/HP/hp-laserjet_pro_mfp_m27cnw.ppd.gz share/ppd/HP/hp-laserjet_pro_mfp_m329-ps.ppd.gz share/ppd/HP/hp-laserjet_pro_mfp_m435-ps.ppd.gz -share/ppd/HP/hp-laserjet_pro_mfp_3001-3008-ps.ppd.gz -share/ppd/HP/hp-laserjet_pro_mfp_3101-3108-ps.ppd.gz +share/ppd/HP/hp-laserjet_pro_p1100_plus_series.ppd.gz share/ppd/HP/hp-laserjet_professional_m1132_mfp.ppd.gz share/ppd/HP/hp-laserjet_professional_m1136_mfp.ppd.gz share/ppd/HP/hp-laserjet_professional_m1137_mfp.ppd.gz @@ -1725,6 +1727,9 @@ share/ppd/HP/hp-officejet_pro_8732-ps.ppd.gz share/ppd/HP/hp-officejet_pro_8740-ps.ppd.gz share/ppd/HP/hp-officejet_pro_9010_series.ppd.gz share/ppd/HP/hp-officejet_pro_9020_series.ppd.gz +share/ppd/HP/hp-officejet_pro_9110b_series.ppd.gz +share/ppd/HP/hp-officejet_pro_9120b_series.ppd.gz +share/ppd/HP/hp-officejet_pro_9130b_series.ppd.gz share/ppd/HP/hp-officejet_pro_k5300.ppd.gz share/ppd/HP/hp-officejet_pro_k5400.ppd.gz share/ppd/HP/hp-officejet_pro_k550.ppd.gz