From patchwork Mon Jul 25 16:02:04 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Tremer X-Patchwork-Id: 5762 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 (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 4Ls4Yg09s2z3wvM for ; Mon, 25 Jul 2022 16:02:15 +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 ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail02.haj.ipfire.org", Issuer "R3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4Ls4Yc2l34z3H1; Mon, 25 Jul 2022 16:02:12 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4Ls4YZ6mfMz303X; Mon, 25 Jul 2022 16:02:10 +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 (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4Ls4YY0Z8qz2xxK for ; Mon, 25 Jul 2022 16:02:09 +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 ECDSA (P-384) server-digest SHA384) (No client certificate requested) by mail01.ipfire.org (Postfix) with ESMTPSA id 4Ls4YX6WtGz1Dy; Mon, 25 Jul 2022 16:02:08 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1658764928; 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=cxI31ac4SvPWi/gvHrvKBE0mTWMt5dr4mtClwa0aV/c=; b=IHFqWm6ywJ59dwf24U/0JgYmojijzqQQlIrzgpOeMgftAPRW3WXwkoiC8a0+F0k12+ry6V 2HMGh2fmeP7BMCBg== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1658764928; 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=cxI31ac4SvPWi/gvHrvKBE0mTWMt5dr4mtClwa0aV/c=; b=SrvvGoG1YmfFlxR+TQUfDegPw3q/k+BaatSfg4pmW54Sf3vFCe5I9jUvMzjeXtu5vy8fat DnlMHowCFPIMFHDffSSb+FblxTBq5SKTs584eQCHxfOyspm6Asq9uD95m5PeZesJ5+qkgP xNGg9JrlyMspNzB/ZGrqZqNQXZUBCuiWJd6vzu/iFiQmS2UhN0iuscVKEQLVgpWKDkFu10 9TuTZupgBTOqMBgQft9ggokrKu4merCmHqwo/ksEphQj6hkhhYYU9wVLWz5idEtjX/S8tD RngQyZl3TZCyL2dob6DNWX4ptC4nnLwZ6KWk61My8el3Esb9qzh0P/skLSRTTw== From: Michael Tremer To: development@lists.ipfire.org Subject: [PATCH 2/2] cups: Add link at /etc/cups pointing to configuration Date: Mon, 25 Jul 2022 16:02:04 +0000 Message-Id: <20220725160204.3885100-2-michael.tremer@ipfire.org> In-Reply-To: <20220725160204.3885100-1-michael.tremer@ipfire.org> References: <20220725160204.3885100-1-michael.tremer@ipfire.org> MIME-Version: 1.0 X-BeenThere: development@lists.ipfire.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: IPFire development talk List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Michael Tremer Errors-To: development-bounces@lists.ipfire.org Sender: "Development" This is needed because cups-pdf is looking for its configuration file in /etc/cups. Signed-off-by: Michael Tremer --- config/rootfiles/packages/cups | 1 + lfs/cups | 5 ++++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/config/rootfiles/packages/cups b/config/rootfiles/packages/cups index 18987be0e..65ad4f418 100644 --- a/config/rootfiles/packages/cups +++ b/config/rootfiles/packages/cups @@ -1,3 +1,4 @@ +etc/cups etc/dbus-1/system.d/cups.conf etc/pam.d/cups etc/rc.d/init.d/cups diff --git a/lfs/cups b/lfs/cups index d333532e3..312f165d8 100644 --- a/lfs/cups +++ b/lfs/cups @@ -33,7 +33,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/cups-$(VER) TARGET = $(DIR_INFO)/$(THISAPP) PROG = cups -PAK_VER = 27 +PAK_VER = 28 DEPS = avahi cups-filters dbus ghostscript @@ -104,5 +104,8 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) $(call INSTALL_INITSCRIPTS,$(SERVICES)) cp -fv $(DIR_SRC)/config/cups/cupsd.conf /var/ipfire/cups/ + # Install convenience link + ln -svf /var/ipfire/cups /etc/cups + @rm -rf $(DIR_APP) @$(POSTBUILD)