From patchwork Mon Oct 14 16:51:03 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adolf Belka X-Patchwork-Id: 8171 Return-Path: Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) client-signature RSA-PSS (4096 bits)) (Client CN "mail01.haj.ipfire.org", Issuer "R10" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 4XS3Cl6cgXz3wyH for ; Mon, 14 Oct 2024 16:51:31 +0000 (UTC) Received: from mail02.haj.ipfire.org (mail02.haj.ipfire.org [172.28.1.201]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) client-signature ECDSA (secp384r1)) (Client CN "mail02.haj.ipfire.org", Issuer "E6" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4XS3Ch5S5Cz2rk; Mon, 14 Oct 2024 16:51:28 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4XS3Ch4gZ9z34Lx; Mon, 14 Oct 2024 16:51:28 +0000 (UTC) Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) client-signature RSA-PSS (4096 bits)) (Client CN "mail01.haj.ipfire.org", Issuer "R10" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4XS3Cb5jNdz340B for ; Mon, 14 Oct 2024 16:51:23 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mail01.ipfire.org (Postfix) with ESMTPSA id 4XS3Cb4Bxrz2rk; Mon, 14 Oct 2024 16:51:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1728924683; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=HFHSAse7Z73csWeLnt5VeQVvtfv5h/85d9gV0s+fVWg=; b=s/A6VIdMAfOHiBMHPS5A0W3MOQkBQU8j3DLppp0spjqlbxugW3oItKLPupcVuhriGTQg1C Cf3Z+njHATa8zd4KBry3QfRC5l9W8PsvrELevajXTrK1JovG2DLzp6xrpY/DE+G453eACw lgl0r7b3OUVpgVkitzRwSEKHByA5pM4Qoi8h5+ZwMiHDzmw9LIUMr+82ecGTVII2aSMvhs owgOYMc7fI9iIYHGRgdOQzXzQRbqblTNwR/yoJps6IQ8U5ZQVvcr/EGhoSs1vhVhAswt1N RXD5esDNKvUouH6PWeaXXZabDuAiTL8GiCp2yXVVXvHh4fhOI76K4dFL7hT8rw== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1728924683; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=HFHSAse7Z73csWeLnt5VeQVvtfv5h/85d9gV0s+fVWg=; b=wM3dp7UAbqBrCgi4jFgNecBmZTc5H2v710A1h9ov36lFrA0I4Jb15/LcQ3A2gmuCcRghyI j/P8eZK66AEvF/Bw== From: Adolf Belka To: development@lists.ipfire.org Subject: [PATCH 03/17] cups-pdf: Removal of cups-pdf Date: Mon, 14 Oct 2024 18:51:03 +0200 Message-ID: <20241014165117.15440-3-adolf.belka@ipfire.org> In-Reply-To: <20241014165117.15440-1-adolf.belka@ipfire.org> References: <20241014165117.15440-1-adolf.belka@ipfire.org> MIME-Version: 1.0 Message-ID-Hash: AQVBGZAVPTNLTWMD4O74GCYRMI35AAOG X-Message-ID-Hash: AQVBGZAVPTNLTWMD4O74GCYRMI35AAOG X-MailFrom: adolf.belka@ipfire.org X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.8 Precedence: list List-Id: IPFire development talk Archived-At: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: - As discussed at IPFire conf call on 7th Oct Tested-by: Adolf Belka Signed-off-by: Adolf Belka --- config/rootfiles/packages/cups-pdf | 5 -- lfs/cups-pdf | 106 ------------------------- src/patches/cups-pdf-setpdfwrite.patch | 27 ------- 3 files changed, 138 deletions(-) delete mode 100644 config/rootfiles/packages/cups-pdf delete mode 100644 lfs/cups-pdf delete mode 100644 src/patches/cups-pdf-setpdfwrite.patch diff --git a/config/rootfiles/packages/cups-pdf b/config/rootfiles/packages/cups-pdf deleted file mode 100644 index 70324cad1..000000000 --- a/config/rootfiles/packages/cups-pdf +++ /dev/null @@ -1,5 +0,0 @@ -usr/lib/cups/backend/cups-pdf -#usr/share/ppd/cups-pdf -usr/share/ppd/cups-pdf/CUPS-PDF_noopt.ppd -usr/share/ppd/cups-pdf/CUPS-PDF_opt.ppd -var/ipfire/cups/cups-pdf.conf diff --git a/lfs/cups-pdf b/lfs/cups-pdf deleted file mode 100644 index 5e9f86562..000000000 --- a/lfs/cups-pdf +++ /dev/null @@ -1,106 +0,0 @@ -############################################################################### -# # -# IPFire.org - A linux based firewall # -# Copyright (C) 2007-2020 IPFire Team # -# # -# 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 3 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, see . # -# # -############################################################################### - -############################################################################### -# Definitions -############################################################################### - -include Config - -SUMMARY = OpenPrinting CUPS filters, backends, and cups-browsed - -VER = 3.0.1 - -THISAPP = cups-pdf-$(VER) -DL_FILE = cups-pdf_$(VER).tar.gz -DL_FROM = $(URL_IPFIRE) -DIR_APP = $(DIR_SRC)/$(THISAPP) -TARGET = $(DIR_INFO)/$(THISAPP) -PROG = cups-pdf -PAK_VER = 1 - -DEPS = cups - -SERVICES = - -############################################################################### -# Top-level Rules -############################################################################### - -objects = $(DL_FILE) - -$(DL_FILE) = $(DL_FROM)/$(DL_FILE) - -$(DL_FILE)_BLAKE2 = f964358c5e465447e703848a697f6c801624a1836e2a0a4026c507c66048cf4bef92327508598ec7e9a356d4f57894a6b610e55b7a9a34e942cf2b88c6c55b85 - -install : $(TARGET) - -check : $(patsubst %,$(DIR_CHK)/%,$(objects)) - -download :$(patsubst %,$(DIR_DL)/%,$(objects)) - -b2 : $(subst %,%_BLAKE2,$(objects)) - -dist: - $(PAK) - -############################################################################### -# Downloading, checking, b2sum -############################################################################### - -$(patsubst %,$(DIR_CHK)/%,$(objects)) : - @$(CHECK) - -$(patsubst %,$(DIR_DL)/%,$(objects)) : - @$(LOAD) - -$(subst %,%_BLAKE2,$(objects)) : - @$(B2SUM) - -############################################################################### -# Installation Details -############################################################################### - -$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) - @$(PREBUILD) - @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE) - cd $(DIR_APP) && patch -Np0 < $(DIR_SRC)/src/patches/cups-pdf-setpdfwrite.patch - - # Compile backend - cd $(DIR_APP)/src && gcc $(CFLAGS) cups-pdf.c -o cups-pdf -lcups - - # Install backend - cd $(DIR_APP)/src && install -v -m 700 \ - cups-pdf /usr/lib/cups/backend/cups-pdf - - # Install PPD files - -mkdir -pv /usr/share/ppd/cups-pdf - cd $(DIR_APP)/extra && install -v -m 644 \ - CUPS-PDF_noopt.ppd \ - CUPS-PDF_opt.ppd \ - /usr/share/ppd/cups-pdf - - # Install configuration - -mkdir -pv /var/ipfire/cups - cd $(DIR_APP)/extra && install -v -m 644 \ - cups-pdf.conf /var/ipfire/cups/cups-pdf.conf - - @rm -rf $(DIR_APP) - @$(POSTBUILD) diff --git a/src/patches/cups-pdf-setpdfwrite.patch b/src/patches/cups-pdf-setpdfwrite.patch deleted file mode 100644 index 58d71c02f..000000000 --- a/src/patches/cups-pdf-setpdfwrite.patch +++ /dev/null @@ -1,27 +0,0 @@ -diff -ur extra/cups-pdf.conf extra/cups-pdf.conf ---- extra/cups-pdf.conf 2021-06-03 08:50:00.109555813 -0400 -+++ extra/cups-pdf.conf 2021-06-03 08:51:27.530198340 -0400 -@@ -250,9 +250,9 @@ - ### Key: GSCall (config) - ## command line for calling GhostScript (!!! DO NOT USE NEWLINES !!!) - ## MacOSX: for using pstopdf set this to %s %s -o %s %s --### Default: %s -q -dCompatibilityLevel=%s -dNOPAUSE -dBATCH -dSAFER -sDEVICE=pdfwrite -sOutputFile="%s" -dAutoRotatePages=/PageByPage -dAutoFilterColorImages=false -dColorImageFilter=/FlateEncode -dPDFSETTINGS=/prepress -c .setpdfwrite -f %s -+### Default: %s -q -dCompatibilityLevel=%s -dNOPAUSE -dBATCH -dSAFER -sDEVICE=pdfwrite -sOutputFile="%s" -dAutoRotatePages=/PageByPage -dAutoFilterColorImages=false -dColorImageFilter=/FlateEncode -dPDFSETTINGS=/prepress -c 30000000 setvmthreshold -f %s - --#GSCall %s -q -dCompatibilityLevel=%s -dNOPAUSE -dBATCH -dSAFER -sDEVICE=pdfwrite -sOutputFile="%s" -dAutoRotatePages=/PageByPage -dAutoFilterColorImages=false -dColorImageFilter=/FlateEncode -dPDFSETTINGS=/prepress -c .setpdfwrite -f %s -+#GSCall %s -q -dCompatibilityLevel=%s -dNOPAUSE -dBATCH -dSAFER -sDEVICE=pdfwrite -sOutputFile="%s" -dAutoRotatePages=/PageByPage -dAutoFilterColorImages=false -dColorImageFilter=/FlateEncode -dPDFSETTINGS=/prepress -c 30000000 setvmthreshold -f %s - - ### Key: PDFVer (config, ppd, lptopions) - ## PDF version to be created - can be "1.5", "1.4", "1.3" or "1.2" -diff -ur src/cups-pdf.h src/cups-pdf.h ---- src/cups-pdf.h 2021-06-03 08:50:00.109555813 -0400 -+++ src/cups-pdf.h 2021-06-03 08:51:44.833325511 -0400 -@@ -58,7 +58,7 @@ - { "AnonDirName", SEC_CONF|SEC_PPD, { "/var/spool/cups-pdf/ANONYMOUS" } }, - { "AnonUser", SEC_CONF|SEC_PPD, { "nobody" } }, - { "GhostScript", SEC_CONF|SEC_PPD, { "/usr/bin/gs" } }, -- { "GSCall", SEC_CONF|SEC_PPD, { "%s -q -dCompatibilityLevel=%s -dNOPAUSE -dBATCH -dSAFER -sDEVICE=pdfwrite -sOutputFile=\"%s\" -dAutoRotatePages=/PageByPage -dAutoFilterColorImages=false -dColorImageFilter=/FlateEncode -dPDFSETTINGS=/prepress -c .setpdfwrite -f %s" } }, -+ { "GSCall", SEC_CONF|SEC_PPD, { "%s -q -dCompatibilityLevel=%s -dNOPAUSE -dBATCH -dSAFER -sDEVICE=pdfwrite -sOutputFile=\"%s\" -dAutoRotatePages=/PageByPage -dAutoFilterColorImages=false -dColorImageFilter=/FlateEncode -dPDFSETTINGS=/prepress -c 30000000 setvmthreshold -f %s" } }, - { "Grp", SEC_CONF|SEC_PPD, { "lp" } }, - { "GSTmp", SEC_CONF|SEC_PPD, { "TMPDIR=/var/tmp" } }, - { "Log", SEC_CONF|SEC_PPD, { "/var/log/cups" } },