From d398e429d701c6c7d71b8746f2904999d256c7fd Mon Sep 17 00:00:00 2001 From: eabdullin Date: Wed, 15 Nov 2023 02:28:02 +0000 Subject: [PATCH] import UBI cups-filters-1.20.0-32.el8 --- SOURCES/lftocrlf | 124 ++++++++++++++++++++++++++++++++++++++++ SOURCES/lftocrlf.ppd | 47 +++++++++++++++ SPECS/cups-filters.spec | 27 ++++++--- 3 files changed, 191 insertions(+), 7 deletions(-) create mode 100644 SOURCES/lftocrlf create mode 100644 SOURCES/lftocrlf.ppd diff --git a/SOURCES/lftocrlf b/SOURCES/lftocrlf new file mode 100644 index 0000000..ee6e54e --- /dev/null +++ b/SOURCES/lftocrlf @@ -0,0 +1,124 @@ +#!/bin/bash +## Copyright (C) 2003-2006 Red Hat, Inc. +## Copyright (C) 2003-2006 Tim Waugh +## Changed on 2007/05/17, Opher Shachar, LADPC Ltd. +## Added support for page-ranges option. +## Added page accounting. + +## This program is free software; you can redistribute it and/or +## modify it under the terms of the GNU General Public License +## as published by the Free Software Foundation; either version 2 +## of the License, or (at your option) any later version. + +## This program is distributed in the hope that it will be useful, +## but WITHOUT ANY WARRANTY; without even the implied warranty of +## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +## GNU General Public License for more details. + +## You should have received a copy of the GNU General Public License +## along with this program; if not, write to the Free Software +## Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + +if [ $# == 0 ]; then + echo >&2 "ERROR: $0 job-id user title copies options [file]" + exit 1 +fi + +# Extract the papersize +SENDFF=`grep '^\*DefaultSendFF' "$PPD" | cut -d\ -f2` +COPIES=1 +if [ $# -ge 4 ]; then + COPIES="$4" +fi + +if [ $# -lt 6 ]; then + unset TMPFILE + trap -- 'rm -f "$TMPFILE"' EXIT + TMPFILE=$(mktemp ${TMPDIR:-/tmp}/lftocrlf.XXXXXX) + cat > "$TMPFILE" +else + TMPFILE="$6" +fi + +PR=${5#*page-ranges=} +# Do options specify page-ranges? +if [[ "$PR" != "$5" ]]; then + PR=${PR%% *} +else + #unset PR + PR=1-999999 +fi + +if [[ "$PR" ]]; then + TMPFILE2=$(mktemp ${TMPDIR:-/tmp}/lftocrlf2.XXXXXX) + pagenum=0 + EOF= + { + while [[ "$PR" ]]; do + pl=${PR%%,*} ;# take first subrange + PR=${PR#$pl};PR=${PR#,} ;# remove from range list + pu=${pl#*-} ;# extract upper and lower + pl=${pl%-*} ;# pages of subrange + # Allows interpreting 0-5,3-10 as 1-5,6-10 rejects 5-1 or 1- + (( pagenum >= pl )) && pl=$(( pagenum + 1 )) + (( pl > pu )) && continue + + # Loop reading pages until at or over lower page of subrange. + while read -d `echo -ne '\f'` -r; do + (( pagenum++ )) + (( pagenum == pl )) && break + done + # Did we reach lower page of subrange or EOF? + if (( pagenum < pl )); then + [[ ! "$REPLY" ]] && break ;# empty last page - we're done. + (( pagenum++ )) + EOF=y + fi + # Output page and report to page log + if (( pagenum == pl )); then + echo -n "${REPLY}" >>"$TMPFILE2" + # If EOF then page has no final FF + [[ ! "$EOF" ]] && echo -ne '\f' >>"$TMPFILE2" + echo "PAGE: $pagenum $COPIES" >&2 + fi + [[ "$EOF" ]] && break + # Is the current subrange a single page? + (( pagenum == pu )) && continue + while read -d `echo -ne '\f'` -r; do + (( pagenum++ )) + echo -ne "${REPLY}\f" >>"$TMPFILE2" + echo "PAGE: $pagenum $COPIES" >&2 + (( pagenum == pu )) && break + done + # Could be that we reached EOF before page boundry + if (( pagenum < pu )); then + if [[ "$REPLY" ]]; then + (( pagenum++ )) + echo -n "${REPLY}" >>"$TMPFILE2" + echo "PAGE: $pagenum $COPIES" >&2 + fi + break + fi + done + } <"$TMPFILE" +else + TMPFILE2="$TMPFILE" + pc=$(grep -co `echo -ne '\f'` "$TMPFILE2") + pc=$(( pc * $COPIES )) + echo "PAGE: $pc" >&2 +fi + +while [ "$COPIES" -gt 0 ]; do + # Just translate LF->CRLF at the moment, until the PPD has options added. + sed -e 's/$/'`echo -ne '\r'`'/g' "$TMPFILE2" + + if [ "$SENDFF" == "True" ] + then + echo -ne \\014 + fi + + COPIES=$(($COPIES - 1)) +done +# Cleanup +[[ "$TMPFILE" != "$TMPFILE2" ]] && rm -f "$TMPFILE2" +exit 0 diff --git a/SOURCES/lftocrlf.ppd b/SOURCES/lftocrlf.ppd new file mode 100644 index 0000000..db89448 --- /dev/null +++ b/SOURCES/lftocrlf.ppd @@ -0,0 +1,47 @@ +*PPD-Adobe: "4.3" +*% +*% Text-only printer definition +*% +*FormatVersion: "4.3" +*FileVersion: "1.1" +*LanguageVersion: English +*LanguageEncoding: ISOLatin1 +*PCFileName: "LFTOCRLF.PPD" +*Manufacturer: "Generic" +*Product: "(Generic)" +*cupsVersion: 1.0 +*cupsManualCopies: True +*cupsModelNumber: 2 +*cupsFilter: "text/plain 0 lftocrlf" +*ModelName: "Generic LF-to-CRLF printer" +*ShortNickName: "Generic LF-to-CRLF printer" +*NickName: "Generic LF-to-CRLF printer" +*PSVersion: "(2017.000) 0" +*LanguageLevel: "2" +*ColorDevice: False +*DefaultColorSpace: Gray +*FileSystem: False +*Throughput: "8" +*LandscapeOrientation: Plus90 +*VariablePaperSize: False +*TTRasterizer: Type42 +*DefaultImageableArea: Letter +*ImageableArea Letter/US Letter: "18 36 594 756" +*DefaultPaperDimension: Letter +*PaperDimension Letter/Letter: "612 792" +*OpenUI *PageSize/Media Size: PickOne +*OrderDependency: 10 AnySetup *PageSize +*DefaultPageSize: Letter +*PageSize Letter/Letter: "<>setpagedevice" +*CloseUI: *PageSize +*OpenUI *PageRegion: PickOne +*OrderDependency: 10 AnySetup *PageRegion +*DefaultPageRegion: Letter +*PageRegion Letter/Letter: "<>setpagedevice" +*CloseUI: *PageRegion + +*OpenUI *SendFF: Boolean +*DefaultSendFF: False +*SendFF True/True: "" +*SendFF False/False: "" +*CloseUI: *SendFF diff --git a/SPECS/cups-filters.spec b/SPECS/cups-filters.spec index e2c26f4..961efb7 100644 --- a/SPECS/cups-filters.spec +++ b/SPECS/cups-filters.spec @@ -11,7 +11,7 @@ Summary: OpenPrinting CUPS filters and backends Name: cups-filters Version: 1.20.0 -Release: 29%{?dist}.2 +Release: 32%{?dist} # For a breakdown of the licensing, see COPYING file # GPLv2: filters: commandto*, imagetoraster, pdftops, rasterto*, @@ -27,6 +27,8 @@ License: GPLv2 and GPLv2+ and GPLv3 and GPLv3+ and LGPLv2+ and MIT and BSD with Url: http://www.linuxfoundation.org/collaborate/workgroups/openprinting/cups-filters Source0: http://www.openprinting.org/download/cups-filters/cups-filters-%{version}.tar.xz Source1: testprint +Source2: lftocrlf.ppd +Source3: lftocrlf Patch01: cups-filters-createall.patch Patch02: cups-filters-brftopagedbrf-install.patch @@ -63,7 +65,7 @@ Patch14: 0001-cups-browsed-Always-save-.-default-option-entries-fr.patch Patch15: cups-browsed-renew.patch # 1981612 - [RHEL 8] pdftopdf doesn't handle "page-range=10-2147483647" correctly Patch16: 0001-libcupsfilters-Fix-page-range-like-10-in-pdftopdf-fi.patch -# 2193390 - Edges cropped when printing PostScript document +# 2185675 - Edges cropped when printing PostScript document Patch17: gstoraster-margins.patch # CVE-2023-24805 cups-filters: remote code execution in cups-filters, beh CUPS backend Patch18: beh-cve2023.patch @@ -237,10 +239,10 @@ The package provides filters and cups-brf backend needed for braille printing. %patch15 -p1 -b .renew # 1981612 - [RHEL 8] pdftopdf doesn't handle "page-range=10-2147483647" correctly %patch16 -p1 -b .ranges -# 2193390 - Edges cropped when printing PostScript document +# 2185675 - Edges cropped when printing PostScript document %patch17 -p1 -b .margins # CVE-2023-24805 cups-filters: remote code execution in cups-filters, beh CUPS backend -%patch18 -p1 -b .cve2023 +%patch18 -p1 -b .cve202324805 %build @@ -281,6 +283,11 @@ make %{?_smp_mflags} %install make install DESTDIR=%{buildroot} +# Add textonly driver back, but as lftocrlf +# part of 2118406 - texttotext filter strips ESC causing PCL files to be printed improperly +install -p -m 0755 %{SOURCE3} %{buildroot}%{_cups_serverbin}/filter/lftocrlf +install -p -m 0644 %{SOURCE2} %{buildroot}%{_datadir}/ppd/cupsfilters/lftocrlf.ppd + # Don't ship libtool la files. rm -f %{buildroot}%{_libdir}/lib*.la @@ -349,6 +356,9 @@ make check %attr(0755,root,root) %{_cups_serverbin}/filter/imagetopdf %attr(0755,root,root) %{_cups_serverbin}/filter/imagetops %attr(0755,root,root) %{_cups_serverbin}/filter/imagetoraster +# Add textonly driver back, but as lftocrlf +# part of 2118406 - texttotext filter strips ESC causing PCL files to be printed improperly +%attr(0755,root,root) %{_cups_serverbin}/filter/lftocrlf %attr(0755,root,root) %{_cups_serverbin}/filter/pdftopdf %attr(0755,root,root) %{_cups_serverbin}/filter/pdftops %attr(0755,root,root) %{_cups_serverbin}/filter/pdftoraster @@ -443,11 +453,14 @@ make check %endif %changelog -* Mon May 15 2023 Zdenek Dohnal - 1.20.0-29.2 +* Tue Aug 08 2023 Zdenek Dohnal - 1.20.0-32 +- 2118406 - texttotext filter strips ESC causing PCL files to be printed improperly + +* Wed Jun 07 2023 Zdenek Dohnal - 1.20.0-31 - CVE-2023-24805 cups-filters: remote code execution in cups-filters, beh CUPS backend -* Fri May 05 2023 Tomas Korbar - 1.20.0-29.1 -- 2193390 - Edges cropped when printing PostScript document +* Thu Apr 13 2023 Zdenek Dohnal - 1.20.0-30 +- 2185675 - Edges cropped when printing PostScript document * Thu Sep 22 2022 Zdenek Dohnal - 1.20.0-29 - 2128539 - build braille subpackage only on Fedora and CentOS Stream > 9