diff --git a/cups-filters.spec b/cups-filters.spec index 32dda51..a29e97c 100644 --- a/cups-filters.spec +++ b/cups-filters.spec @@ -11,7 +11,7 @@ Summary: OpenPrinting CUPS filters and backends Name: cups-filters Version: 1.28.7 -Release: 13%{?dist} +Release: 12%{?dist} # For a breakdown of the licensing, see COPYING file # GPLv2: filters: commandto*, imagetoraster, pdftops, rasterto*, @@ -26,8 +26,6 @@ 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: lftocrlf.ppd -Source2: lftocrlf # backported from upstream #Patch01: 0001-libcupsfilters-In-the-PPD-generator-really-give-prio.patch @@ -230,10 +228,6 @@ The package provides filters and cups-brf backend needed for braille printing. %install %make_install -# 2229784 - Add textonly driver back, but as lftocrlf -install -p -m 0755 %{SOURCE2} %{buildroot}%{_cups_serverbin}/filter/lftocrlf -install -p -m 0644 %{SOURCE1} %{buildroot}%{_datadir}/ppd/cupsfilters/lftocrlf.ppd - # Don't ship libtool la files. rm -f %{buildroot}%{_libdir}/lib*.la @@ -313,8 +307,6 @@ done %attr(0755,root,root) %{_cups_serverbin}/filter/imagetopdf %attr(0755,root,root) %{_cups_serverbin}/filter/imagetops %attr(0755,root,root) %{_cups_serverbin}/filter/imagetoraster -# 2229784 - Add textonly driver back, but as lftocrlf -%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 @@ -408,9 +400,6 @@ done %endif %changelog -* Tue Aug 08 2023 Zdenek Dohnal - 1.28.7-13 -- 2229784 - Add textonly driver back, but as lftocrlf - * Wed Jun 07 2023 Zdenek Dohnal - 1.28.7-12 - CVE-2023-24805 cups-filters: remote code execution in cups-filters, beh CUPS backend diff --git a/lftocrlf b/lftocrlf deleted file mode 100644 index ee6e54e..0000000 --- a/lftocrlf +++ /dev/null @@ -1,124 +0,0 @@ -#!/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/lftocrlf.ppd b/lftocrlf.ppd deleted file mode 100644 index db89448..0000000 --- a/lftocrlf.ppd +++ /dev/null @@ -1,47 +0,0 @@ -*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