commit: df23bbfb482222e3b836b9c4e85a6f7bed2132be Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Tue Nov 25 04:01:30 2025 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Tue Nov 25 04:01:30 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=df23bbfb
net-print/libppd: drop 2.1_beta1-r1, 2.1.0 Signed-off-by: Sam James <sam <AT> gentoo.org> net-print/libppd/Manifest | 2 - .../files/libppd-2.1_beta1-CVE-2024-47175.patch | 560 --------------------- net-print/libppd/libppd-2.1.0.ebuild | 61 --- net-print/libppd/libppd-2.1_beta1-r1.ebuild | 65 --- 4 files changed, 688 deletions(-) diff --git a/net-print/libppd/Manifest b/net-print/libppd/Manifest index 2d9bc8b1d3be..d4a424c1943f 100644 --- a/net-print/libppd/Manifest +++ b/net-print/libppd/Manifest @@ -1,3 +1 @@ -DIST libppd-2.1.0.tar.xz 585288 BLAKE2B 87d325a659b98e2f489673fd2eb78daec83eafee990008380d852be17fbd990e4daa4a16bd5dc1e3a562040595b858c90d0747d815db0fb97fdccf97a3d4aa49 SHA512 06daf9149910298b2acd103c58f8bd345180219e42fab7dbc162b8370492e28b7bcecc6d72192fc8d053ec245a270d1901812662dd50687ff5b327a40ac0f475 DIST libppd-2.1.1.tar.xz 585776 BLAKE2B 7d2279d61948abf516fb33022ac750efc877a34b0c1e12351f0f2a2b0302abc7bb0c287bff4887874a3f59d7eb84369d5b9cc9c59f83c4a4936976d3898c40db SHA512 b469a94d090f49776486c8b5570bd40d964ea493b81fc404c23e88f18cfdaef2bbddcdf5123c243d9284fa254eec727e6ea4003075386f8f70c3f9145307458b -DIST libppd-2.1b1.tar.xz 583692 BLAKE2B f9889ba7758097d2f794b16bdd74758223036daa8e49b191d07789e36ad7e2d69693c9ebb0b89c1c52f23f90fee8b56e1532246da90b1898caf1c557a416c20c SHA512 2b1ab3444f9de4a856f116aae83fd2aaa61adec9862bdd6dcff5fe2672e593b1e69e4da3638994ac4762dcc0e2640c5e3cbf3af247017d3790f01ef10395f54a diff --git a/net-print/libppd/files/libppd-2.1_beta1-CVE-2024-47175.patch b/net-print/libppd/files/libppd-2.1_beta1-CVE-2024-47175.patch deleted file mode 100644 index 60817509cdb3..000000000000 --- a/net-print/libppd/files/libppd-2.1_beta1-CVE-2024-47175.patch +++ /dev/null @@ -1,560 +0,0 @@ -https://bugs.gentoo.org/940314 -https://github.com/OpenPrinting/libppd/commit/d681747ebf12602cb426725eb8ce2753211e2477 - -From d681747ebf12602cb426725eb8ce2753211e2477 Mon Sep 17 00:00:00 2001 -From: Zdenek Dohnal <[email protected]> -Date: Thu, 26 Sep 2024 23:12:14 +0200 -Subject: [PATCH] Prevent PPD generation based on invalid IPP response - -Author: Mike Sweet -Minor fixes: Zdenek Dohnal - -Fixes CVE-2024-47175 ---- a/ppd/ppd-cache.c -+++ b/ppd/ppd-cache.c -@@ -3434,7 +3435,7 @@ ppdCacheGetBin( - - // - // Range check input... -- -+ - - if (!pc || !output_bin) - return (NULL); -@@ -3935,7 +3936,7 @@ ppdCacheGetPageSize( - { - // - // Check not only the base size (like "A4") but also variants (like -- // "A4.Borderless"). We check only the margins and orientation but do -+ // "A4.Borderless"). We check only the margins and orientation but do - // not re-check the size. - // - -@@ -4776,7 +4777,7 @@ ppdPwgPpdizeName(const char *ipp, // I - IPP keyword - *end; // End of name buffer - - -- if (!ipp) -+ if (!ipp || !_ppd_isalnum(*ipp)) - { - *name = '\0'; - return; -@@ -4786,13 +4787,19 @@ ppdPwgPpdizeName(const char *ipp, // I - IPP keyword - - for (ptr = name + 1, end = name + namesize - 1; *ipp && ptr < end;) - { -- if (*ipp == '-' && _ppd_isalnum(ipp[1])) -+ if (*ipp == '-' && isalnum(ipp[1])) - { - ipp ++; - *ptr++ = (char)toupper(*ipp++ & 255); - } -- else -+ else if (*ipp == '_' || *ipp == '.' || *ipp == '-' || isalnum(*ipp)) -+ { - *ptr++ = *ipp++; -+ } -+ else -+ { -+ ipp ++; -+ } - } - - *ptr = '\0'; ---- a/ppd/ppd-generator.c -+++ b/ppd/ppd-generator.c -@@ -71,6 +72,7 @@ typedef struct _ppd_size_s // **** Media Size (cups_size_t of lib - - static int http_connect(http_t **http, const char *url, char *resource, - size_t ressize); -+static void ppd_put_string(cups_file_t *fp, cups_lang_t *lang, const char *ppd_option, const char *ppd_choice, const char *pwg_msgid); - - - // -@@ -80,7 +82,7 @@ static int http_connect(http_t **http, const char *url, char *resource, - // than CUPS 2.2.x. We have also an additional test and development - // platform for this code. Taken from cups/ppd-cache.c, - // cups/string-private.h, cups/string.c. --// -+// - // The advantage of PPD generation instead of working with System V - // interface scripts is that the print dialogs of the clients do not - // need to ask the printer for its options via IPP. So we have access -@@ -144,7 +146,7 @@ char ppdgenerator_msg[1024]; - // IPP 1.x legacy) - // - --char * // O - PPD filename or NULL -+char * // O - PPD filename or NULL - // on error - ppdCreatePPDFromIPP(char *buffer, // I - Filename buffer - size_t bufsize, // I - Size of filename -@@ -195,7 +197,7 @@ ppdCreatePPDFromIPP2(char *buffer, // I - Filename buffer - cups_array_t *conflicts, // I - Array of - // constraints - cups_array_t *sizes, // I - Media sizes we've -- // added -+ // added - char* default_pagesize, // I - Default page size - const char *default_cluster_color, // I - cluster def - // color (if cluster's -@@ -207,6 +209,7 @@ ppdCreatePPDFromIPP2(char *buffer, // I - Filename buffer - size_t status_msg_size) // I - Size of status - // message buffer - { -+ cups_lang_t *lang; // Localization language - cups_file_t *fp; // PPD file - cups_array_t *printer_sizes; // Media sizes we've added - _ppd_size_t *size; // Current media size -@@ -219,9 +222,10 @@ ppdCreatePPDFromIPP2(char *buffer, // I - Filename buffer - ipp_t *media_col, // Media collection - *media_size; // Media size collection - char make[256], // Make and model -- *model, // Model name -+ *mptr, // Pointer into make and model - ppdname[PPD_MAX_NAME]; - // PPD keyword -+ const char *model; // Model name - int i, j, // Looping vars - count = 0, // Number of values - bottom, // Largest bottom margin -@@ -303,6 +307,68 @@ ppdCreatePPDFromIPP2(char *buffer, // I - Filename buffer - return (NULL); - } - -+ // -+ // Get a sanitized make and model... -+ // -+ -+ if ((attr = ippFindAttribute(supported, "printer-make-and-model", IPP_TAG_TEXT)) != NULL && ippValidateAttribute(attr)) -+ { -+ // Sanitize the model name to only contain PPD-safe characters. -+ strlcpy(make, ippGetString(attr, 0, NULL), sizeof(make)); -+ -+ for (mptr = make; *mptr; mptr ++) -+ { -+ if (*mptr < ' ' || *mptr >= 127 || *mptr == '\"') -+ { -+ // Truncate the make and model on the first bad character... -+ *mptr = '\0'; -+ break; -+ } -+ } -+ -+ while (mptr > make) -+ { -+ // Strip trailing whitespace... -+ mptr --; -+ if (*mptr == ' ') -+ *mptr = '\0'; -+ } -+ -+ if (!make[0]) -+ { -+ // Use a default make and model if nothing remains... -+ strlcpy(make, "Unknown", sizeof(make)); -+ } -+ } -+ else -+ { -+ // Use a default make and model... -+ strlcpy(make, "Unknown", sizeof(make)); -+ } -+ -+ if (!strncasecmp(make, "Hewlett Packard ", 16) || !strncasecmp(make, "Hewlett-Packard ", 16)) -+ { -+ // Normalize HP printer make and model... -+ model = make + 16; -+ strlcpy(make, "HP", sizeof(make)); -+ -+ if (!strncasecmp(model, "HP ", 3)) -+ model += 3; -+ } -+ else if ((mptr = strchr(make, ' ')) != NULL) -+ { -+ // Separate "MAKE MODEL"... -+ while (*mptr && *mptr == ' ') -+ *mptr++ = '\0'; -+ -+ model = mptr; -+ } -+ else -+ { -+ // No separate model name... -+ model = "Printer"; -+ } -+ - // - // Standard stuff for PPD file... - // -@@ -331,25 +397,6 @@ ppdCreatePPDFromIPP2(char *buffer, // I - Filename buffer - } - } - -- if ((attr = ippFindAttribute(supported, "printer-make-and-model", -- IPP_TAG_TEXT)) != NULL) -- strlcpy(make, ippGetString(attr, 0, NULL), sizeof(make)); -- else if (make_model && make_model[0] != '\0') -- strlcpy(make, make_model, sizeof(make)); -- else -- strlcpy(make, "Unknown Printer", sizeof(make)); -- -- if (!strncasecmp(make, "Hewlett Packard ", 16) || -- !strncasecmp(make, "Hewlett-Packard ", 16)) -- { -- model = make + 16; -- strlcpy(make, "HP", sizeof(make)); -- } -- else if ((model = strchr(make, ' ')) != NULL) -- *model++ = '\0'; -- else -- model = make; -- - cupsFilePrintf(fp, "*Manufacturer: \"%s\"\n", make); - cupsFilePrintf(fp, "*ModelName: \"%s %s\"\n", make, model); - cupsFilePrintf(fp, "*Product: \"(%s %s)\"\n", make, model); -@@ -445,21 +492,19 @@ ppdCreatePPDFromIPP2(char *buffer, // I - Filename buffer - } - cupsFilePuts(fp, "\"\n"); - -- if ((attr = ippFindAttribute(supported, "printer-more-info", IPP_TAG_URI)) != -- NULL) -+ if ((attr = ippFindAttribute(supported, "printer-more-info", IPP_TAG_URI)) != NULL && ippValidateAttribute(attr)) - cupsFilePrintf(fp, "*APSupplies: \"%s\"\n", ippGetString(attr, 0, NULL)); - -- if ((attr = ippFindAttribute(supported, "printer-charge-info-uri", -- IPP_TAG_URI)) != NULL) -- cupsFilePrintf(fp, "*cupsChargeInfoURI: \"%s\"\n", ippGetString(attr, 0, -- NULL)); -+ if ((attr = ippFindAttribute(supported, "printer-charge-info-uri", IPP_TAG_URI)) != NULL && ippValidateAttribute(attr)) -+ cupsFilePrintf(fp, "*cupsChargeInfoURI: \"%s\"\n", ippGetString(attr, 0, NULL)); - - // Message catalogs for UI strings -+ lang = cupsLangDefault(); - opt_strings_catalog = cfCatalogOptionArrayNew(); - cfCatalogLoad(NULL, NULL, opt_strings_catalog); - - if ((attr = ippFindAttribute(supported, "printer-strings-uri", -- IPP_TAG_URI)) != NULL) -+ IPP_TAG_URI)) != NULL && ippValidateAttribute(attr)) - { - printer_opt_strings_catalog = cfCatalogOptionArrayNew(); - cfCatalogLoad(ippGetString(attr, 0, NULL), NULL, -@@ -512,7 +557,7 @@ ppdCreatePPDFromIPP2(char *buffer, // I - Filename buffer - response = cupsDoRequest(http, request, resource); - - if ((attr = ippFindAttribute(response, "printer-strings-uri", -- IPP_TAG_URI)) != NULL) -+ IPP_TAG_URI)) != NULL && ippValidateAttribute(attr)) - cupsFilePrintf(fp, "*cupsStringsURI %s: \"%s\"\n", keyword, - ippGetString(attr, 0, NULL)); - -@@ -538,13 +583,10 @@ ppdCreatePPDFromIPP2(char *buffer, // I - Filename buffer - IPP_TAG_BOOLEAN), 0)) - cupsFilePuts(fp, "*cupsJobAccountingUserId: True\n"); - -- if ((attr = ippFindAttribute(supported, "printer-privacy-policy-uri", -- IPP_TAG_URI)) != NULL) -- cupsFilePrintf(fp, "*cupsPrivacyURI: \"%s\"\n", -- ippGetString(attr, 0, NULL)); -+ if ((attr = ippFindAttribute(supported, "printer-privacy-policy-uri", IPP_TAG_URI)) != NULL && ippValidateAttribute(attr)) -+ cupsFilePrintf(fp, "*cupsPrivacyURI: \"%s\"\n", ippGetString(attr, 0, NULL)); - -- if ((attr = ippFindAttribute(supported, "printer-mandatory-job-attributes", -- IPP_TAG_KEYWORD)) != NULL) -+ if ((attr = ippFindAttribute(supported, "printer-mandatory-job-attributes", IPP_TAG_KEYWORD)) != NULL && ippValidateAttribute(attr)) - { - char prefix = '\"'; // Prefix for string - -@@ -564,8 +606,7 @@ ppdCreatePPDFromIPP2(char *buffer, // I - Filename buffer - cupsFilePuts(fp, "\"\n"); - } - -- if ((attr = ippFindAttribute(supported, "printer-requested-job-attributes", -- IPP_TAG_KEYWORD)) != NULL) -+ if ((attr = ippFindAttribute(supported, "printer-requested-job-attributes", IPP_TAG_KEYWORD)) != NULL && ippValidateAttribute(attr)) - { - char prefix = '\"'; // Prefix for string - -@@ -684,7 +725,7 @@ ppdCreatePPDFromIPP2(char *buffer, // I - Filename buffer - } - - // -- // Fax -+ // Fax - // - - if (is_fax) -@@ -734,21 +775,21 @@ ppdCreatePPDFromIPP2(char *buffer, // I - Filename buffer - else if (cupsArrayFind(pdl_list, "image/urf") && - (ippFindAttribute(supported, "urf-supported", IPP_TAG_KEYWORD) != NULL)) - { -- int resStore = 0; // Variable for storing the no. of resolutions in the resolution array -+ int resStore = 0; // Variable for storing the no. of resolutions in the resolution array - int resArray[__INT16_MAX__]; // Creating a resolution array supporting a maximum of 32767 resolutions. - int lowdpi = 0, middpi = 0, hidpi = 0; // Lower , middle and higher resolution - if ((attr = ippFindAttribute(supported, "urf-supported", - IPP_TAG_KEYWORD)) != NULL) - { - for (int i = 0, count = ippGetCount(attr); i < count; i ++) -- { -+ { - const char *rs = ippGetString(attr, i, NULL); // RS values -- const char *rsCopy = ippGetString(attr, i, NULL); // RS values(copy) -+ const char *rsCopy = ippGetString(attr, i, NULL); // RS values(copy) - if (strncasecmp(rs, "RS", 2)) // Comparing attributes to have RS in - // the beginning to indicate the - // resolution feature - continue; -- int resCount = 0; // Using a count variable which can be reset -+ int resCount = 0; // Using a count variable which can be reset - while (*rsCopy != '\0') // Parsing through the copy pointer to - // determine the no. of resolutions - { -@@ -846,7 +887,7 @@ ppdCreatePPDFromIPP2(char *buffer, // I - Filename buffer - formatfound = 1; - is_apple = 1; - } -- } -+ } - } - } - } -@@ -924,7 +965,7 @@ ppdCreatePPDFromIPP2(char *buffer, // I - Filename buffer - if (manual_copies == 1) - cupsFilePuts(fp, "*cupsManualCopies: True\n"); - -- // No resolution requirements by any of the supported PDLs? -+ // No resolution requirements by any of the supported PDLs? - // Use "printer-resolution-supported" attribute - if (common_res == NULL) - { -@@ -1042,7 +1083,7 @@ ppdCreatePPDFromIPP2(char *buffer, // I - Filename buffer - // - // PageSize/PageRegion/ImageableArea/PaperDimension - // -- -+ - cfGenerateSizes(supported, CF_GEN_SIZES_DEFAULT, &printer_sizes, &defattr, - NULL, NULL, NULL, NULL, NULL, NULL, - &min_width, &min_length, -@@ -1421,15 +1462,15 @@ ppdCreatePPDFromIPP2(char *buffer, // I - Filename buffer - if (!strcmp(sources[j], keyword)) - break; - if (j >= 0) -- cupsFilePrintf(fp, "*InputSlot %s%s%s: \"<</MediaPosition %d>>setpagedevice\"\n", -- ppdname, -- (human_readable ? "/" : ""), -- (human_readable ? human_readable : ""), j); -+ { -+ cupsFilePrintf(fp, "*InputSlot %s: \"<</MediaPosition %d>>setpagedevice\"\n", ppdname, j); -+ ppd_put_string(fp, lang, "InputSlot", ppdname, human_readable); -+ } - else -- cupsFilePrintf(fp, "*InputSlot %s%s%s: \"\"\n", -- ppdname, -- (human_readable ? "/" : ""), -- (human_readable ? human_readable : "")); -+ { -+ cupsFilePrintf(fp, "*InputSlot %s%s%s:\"\"\n", ppdname, human_readable ? "/" : "", human_readable ? human_readable : ""); -+ ppd_put_string(fp, lang, "InputSlot", ppdname, human_readable); -+ } - } - cupsFilePuts(fp, "*CloseUI: *InputSlot\n"); - } -@@ -1464,11 +1505,8 @@ ppdCreatePPDFromIPP2(char *buffer, // I - Filename buffer - human_readable = cfCatalogLookUpChoice((char *)keyword, "media-type", - opt_strings_catalog, - printer_opt_strings_catalog); -- cupsFilePrintf(fp, "*MediaType %s%s%s: \"<</MediaType(%s)>>setpagedevice\"\n", -- ppdname, -- (human_readable ? "/" : ""), -- (human_readable ? human_readable : ""), -- ppdname); -+ cupsFilePrintf(fp, "*MediaType %s: \"<</MediaType(%s)>>setpagedevice\"\n", ppdname, ppdname); -+ ppd_put_string(fp, lang, "MediaType", ppdname, human_readable); - } - cupsFilePuts(fp, "*CloseUI: *MediaType\n"); - } -@@ -1791,10 +1829,8 @@ ppdCreatePPDFromIPP2(char *buffer, // I - Filename buffer - human_readable = cfCatalogLookUpChoice((char *)keyword, "output-bin", - opt_strings_catalog, - printer_opt_strings_catalog); -- cupsFilePrintf(fp, "*OutputBin %s%s%s: \"\"\n", -- ppdname, -- (human_readable ? "/" : ""), -- (human_readable ? human_readable : "")); -+ cupsFilePrintf(fp, "*OutputBin %s: \"\"\n", ppdname); -+ ppd_put_string(fp, lang, "OutputBin", ppdname, human_readable); - outputorderinfofound = 0; - faceupdown = 1; - firsttolast = 1; -@@ -1848,7 +1884,7 @@ ppdCreatePPDFromIPP2(char *buffer, // I - Filename buffer - - // - // Finishing options... -- // -+ // - - if ((attr = ippFindAttribute(supported, "finishings-supported", - IPP_TAG_ENUM)) != NULL) -@@ -1973,9 +2009,8 @@ ppdCreatePPDFromIPP2(char *buffer, // I - Filename buffer - human_readable = cfCatalogLookUpChoice(buf, "finishings", - opt_strings_catalog, - printer_opt_strings_catalog); -- cupsFilePrintf(fp, "*StapleLocation %s%s%s: \"\"\n", ppd_keyword, -- (human_readable ? "/" : ""), -- (human_readable ? human_readable : "")); -+ cupsFilePrintf(fp, "*StapleLocation %s: \"\"\n", ppd_keyword); -+ ppd_put_string(fp, lang, "StapleLocation", ppd_keyword, human_readable); - cupsFilePrintf(fp, "*cupsIPPFinishings %d/%s: \"*StapleLocation %s\"\n", - value, keyword, ppd_keyword); - } -@@ -2065,9 +2100,8 @@ ppdCreatePPDFromIPP2(char *buffer, // I - Filename buffer - human_readable = cfCatalogLookUpChoice(buf, "finishings", - opt_strings_catalog, - printer_opt_strings_catalog); -- cupsFilePrintf(fp, "*FoldType %s%s%s: \"\"\n", ppd_keyword, -- (human_readable ? "/" : ""), -- (human_readable ? human_readable : "")); -+ cupsFilePrintf(fp, "*FoldType %s: \"\"\n", ppd_keyword); -+ ppd_put_string(fp, lang, "FoldType", ppd_keyword, human_readable); - cupsFilePrintf(fp, "*cupsIPPFinishings %d/%s: \"*FoldType %s\"\n", - value, keyword, ppd_keyword); - } -@@ -2164,9 +2198,8 @@ ppdCreatePPDFromIPP2(char *buffer, // I - Filename buffer - human_readable = cfCatalogLookUpChoice(buf, "finishings", - opt_strings_catalog, - printer_opt_strings_catalog); -- cupsFilePrintf(fp, "*PunchMedia %s%s%s: \"\"\n", ppd_keyword, -- (human_readable ? "/" : ""), -- (human_readable ? human_readable : "")); -+ cupsFilePrintf(fp, "*PunchMedia %s: \"\"\n", ppd_keyword); -+ ppd_put_string(fp, lang, "PunchMedia", ppd_keyword, human_readable); - cupsFilePrintf(fp, "*cupsIPPFinishings %d/%s: \"*PunchMedia %s\"\n", - value, keyword, ppd_keyword); - } -@@ -2257,9 +2290,8 @@ ppdCreatePPDFromIPP2(char *buffer, // I - Filename buffer - human_readable = cfCatalogLookUpChoice(buf, "finishings", - opt_strings_catalog, - printer_opt_strings_catalog); -- cupsFilePrintf(fp, "*CutMedia %s%s%s: \"\"\n", ppd_keyword, -- (human_readable ? "/" : ""), -- (human_readable ? human_readable : "")); -+ cupsFilePrintf(fp, "*CutMedia %s: \"\"\n", ppd_keyword); -+ ppd_put_string(fp, lang, "CutMedia", ppd_keyword, human_readable); - cupsFilePrintf(fp, "*cupsIPPFinishings %d/%s: \"*CutMedia %s\"\n", - value, keyword, ppd_keyword); - } -@@ -2283,7 +2315,7 @@ ppdCreatePPDFromIPP2(char *buffer, // I - Filename buffer - cupsFilePrintf(fp, "*OpenUI *cupsFinishingTemplate/%s: PickOne\n", - (human_readable ? human_readable : "Finishing Template")); - cupsFilePuts(fp, "*OrderDependency: 10 AnySetup *cupsFinishingTemplate\n"); -- cupsFilePuts(fp, "*DefaultcupsFinishingTemplate: none\n"); -+ cupsFilePuts(fp, "*DefaultcupsFinishingTemplate: None\n"); - human_readable = cfCatalogLookUpChoice("3", "finishings", - opt_strings_catalog, - printer_opt_strings_catalog); -@@ -2314,8 +2346,9 @@ ppdCreatePPDFromIPP2(char *buffer, // I - Filename buffer - printer_opt_strings_catalog); - if (human_readable == NULL) - human_readable = (char *)keyword; -- cupsFilePrintf(fp, "*cupsFinishingTemplate %s/%s: \"\n", keyword, -- human_readable); -+ ppdPwgPpdizeName(keyword, ppdname, sizeof(ppdname)); -+ cupsFilePrintf(fp, "*cupsFinishingTemplate %s: \"\n", ppdname); -+ ppd_put_string(fp, lang, "cupsFinishingTemplate", ppdname, human_readable); - for (finishing_attr = ippGetFirstAttribute(finishing_col); finishing_attr; - finishing_attr = ippGetNextAttribute(finishing_col)) { - if (ippGetValueTag(finishing_attr) == IPP_TAG_BEGIN_COLLECTION) { -@@ -2579,14 +2612,14 @@ ppdCreatePPDFromIPP2(char *buffer, // I - Filename buffer - if (!preset || !preset_name) - continue; - -- if ((localized_name = -+ ppdPwgPpdizeName(preset_name, ppdname, sizeof(ppdname)); -+ -+ localized_name = - cfCatalogLookUpOption((char *)preset_name, - opt_strings_catalog, -- printer_opt_strings_catalog)) == NULL) -- cupsFilePrintf(fp, "*APPrinterPreset %s: \"\n", preset_name); -- else -- cupsFilePrintf(fp, "*APPrinterPreset %s/%s: \"\n", preset_name, -- localized_name); -+ printer_opt_strings_catalog); -+ cupsFilePrintf(fp, "*APPrinterPreset %s: \"\n", ppdname); -+ ppd_put_string(fp, lang, "APPrinterPreset", ppdname, localized_name); - - for (member = ippGetFirstAttribute(preset); member; - member = ippGetNextAttribute(preset)) -@@ -2635,7 +2668,10 @@ ppdCreatePPDFromIPP2(char *buffer, // I - Filename buffer - ippGetString(ippFindAttribute(fin_col, - "finishing-template", - IPP_TAG_ZERO), 0, NULL)) != NULL) -- cupsFilePrintf(fp, "*cupsFinishingTemplate %s\n", keyword); -+ { -+ ppdPwgPpdizeName(keyword, ppdname, sizeof(ppdname)); -+ cupsFilePrintf(fp, "*cupsFinishingTemplate %s\n", ppdname); -+ } - } - } - else if (!strcmp(member_name, "media")) -@@ -2674,7 +2710,7 @@ ppdCreatePPDFromIPP2(char *buffer, // I - Filename buffer - NULL)) != NULL) - { - ppdPwgPpdizeName(keyword, ppdname, sizeof(ppdname)); -- cupsFilePrintf(fp, "*InputSlot %s\n", keyword); -+ cupsFilePrintf(fp, "*InputSlot %s\n", ppdname); - } - - if ((keyword = ippGetString(ippFindAttribute(media_col, "media-type", -@@ -2682,7 +2718,7 @@ ppdCreatePPDFromIPP2(char *buffer, // I - Filename buffer - NULL)) != NULL) - { - ppdPwgPpdizeName(keyword, ppdname, sizeof(ppdname)); -- cupsFilePrintf(fp, "*MediaType %s\n", keyword); -+ cupsFilePrintf(fp, "*MediaType %s\n", ppdname); - } - } - else if (!strcmp(member_name, "print-quality")) -@@ -2832,3 +2868,38 @@ http_connect(http_t **http, // IO - Current HTTP connection - - return (*http != NULL); - } -+ -+ -+/* -+ * 'ppd_put_strings()' - Write localization attributes to a PPD file. -+ */ -+ -+static void -+ppd_put_string(cups_file_t *fp, /* I - PPD file */ -+ cups_lang_t *lang, /* I - Language */ -+ const char *ppd_option,/* I - PPD option */ -+ const char *ppd_choice,/* I - PPD choice */ -+ const char *text) /* I - Localized text */ -+{ -+ if (!text) -+ return; -+ -+ // Add the first line of localized text... -+#if CUPS_VERSION_MAJOR > 2 -+ cupsFilePrintf(fp, "*%s.%s %s/", cupsLangGetName(lang), ppd_option, ppd_choice); -+#else -+ cupsFilePrintf(fp, "*%s.%s %s/", lang->language, ppd_option, ppd_choice); -+#endif // CUPS_VERSION_MAJOR > 2 -+ -+ while (*text && *text != '\n') -+ { -+ // Escape ":" and "<"... -+ if (*text == ':' || *text == '<') -+ cupsFilePrintf(fp, "<%02X>", *text); -+ else -+ cupsFilePutChar(fp, *text); -+ -+ text ++; -+ } -+ cupsFilePuts(fp, ": \"\"\n"); -+} - diff --git a/net-print/libppd/libppd-2.1.0.ebuild b/net-print/libppd/libppd-2.1.0.ebuild deleted file mode 100644 index 09ab5e126738..000000000000 --- a/net-print/libppd/libppd-2.1.0.ebuild +++ /dev/null @@ -1,61 +0,0 @@ -# Copyright 2023-2025 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit libtool - -DESCRIPTION="Legacy library for PPD files, split out of cups-filters" -HOMEPAGE="https://github.com/OpenPrinting/libppd"; -SRC_URI="https://github.com/OpenPrinting/libppd/releases/download/${PV/_beta/b}/${P/_beta/b}.tar.xz"; -S="${WORKDIR}"/${P/_beta/b} - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86" -IUSE="+postscript +poppler" - -# pdftops has various possible implementations, but the default -# really needs to be decent -REQUIRED_USE="|| ( postscript poppler )" - -RDEPEND=" - >=net-print/cups-2 - net-print/libcupsfilters - !<net-print/cups-filters-2.0.0 - virtual/zlib:= - postscript? ( >=app-text/ghostscript-gpl-9.09[cups] ) - poppler? ( >=app-text/poppler-0.32[utils] ) -" -DEPEND="${RDEPEND}" -BDEPEND=" - >=sys-devel/gettext-0.18.3 - virtual/pkgconfig -" - -src_prepare() { - default - elibtoolize -} - -src_configure() { - local myeconfargs=( - --localstatedir="${EPREFIX}"/var - --with-cups-rundir="${EPREFIX}"/run/cups - # This does build time checks for (preferred) tool interfaces. - $(use_enable postscript ghostscript) - $(use_enable poppler pdftops) - # These fallbacks are just probed for the path. Always enable them. - --with-mutool-path="${EPREFIX}"/usr/bin/mutool - --with-pdftocairo-path="${EPREFIX}"/usr/bin/pdftocairo # from poppler - # unpackaged - --disable-acroread - ) - - econf "${myeconfargs[@]}" -} - -src_install() { - default - find "${ED}" -name '*.la' -delete || die -} diff --git a/net-print/libppd/libppd-2.1_beta1-r1.ebuild b/net-print/libppd/libppd-2.1_beta1-r1.ebuild deleted file mode 100644 index 58e2f1c34366..000000000000 --- a/net-print/libppd/libppd-2.1_beta1-r1.ebuild +++ /dev/null @@ -1,65 +0,0 @@ -# Copyright 2023-2025 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit libtool - -DESCRIPTION="Legacy library for PPD files, split out of cups-filters" -HOMEPAGE="https://github.com/OpenPrinting/libppd"; -SRC_URI="https://github.com/OpenPrinting/libppd/releases/download/${PV/_beta/b}/${P/_beta/b}.tar.xz"; -S="${WORKDIR}"/${P/_beta/b} - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86" -IUSE="+postscript +poppler" - -# pdftops has various possible implementations, but the default -# really needs to be decent -REQUIRED_USE="|| ( postscript poppler )" - -RDEPEND=" - >=net-print/cups-2 - net-print/libcupsfilters - !<net-print/cups-filters-2.0.0 - virtual/zlib:= - postscript? ( >=app-text/ghostscript-gpl-9.09[cups] ) - poppler? ( >=app-text/poppler-0.32[utils] ) -" -DEPEND="${RDEPEND}" -BDEPEND=" - >=sys-devel/gettext-0.18.3 - virtual/pkgconfig -" - -PATCHES=( - "${FILESDIR}"/${P}-CVE-2024-47175.patch -) - -src_prepare() { - default - elibtoolize -} - -src_configure() { - local myeconfargs=( - --localstatedir="${EPREFIX}"/var - --with-cups-rundir="${EPREFIX}"/run/cups - # This does build time checks for (preferred) tool interfaces. - $(use_enable postscript ghostscript) - $(use_enable poppler pdftops) - # These fallbacks are just probed for the path. Always enable them. - --with-mutool-path="${EPREFIX}"/usr/bin/mutool - --with-pdftocairo-path="${EPREFIX}"/usr/bin/pdftocairo # from poppler - # unpackaged - --disable-acroread - ) - - econf "${myeconfargs[@]}" -} - -src_install() { - default - find "${ED}" -name '*.la' -delete || die -}
