From patchwork Mon Oct 14 16:51:17 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adolf Belka X-Patchwork-Id: 8185 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 4XS3D03Mp4z3xF2 for ; Mon, 14 Oct 2024 16:51:44 +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 4XS3Cz4RvTz4Yf; Mon, 14 Oct 2024 16:51:43 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4XS3Cz3yBWz344c; Mon, 14 Oct 2024 16:51:43 +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 4XS3Ch57Y8z34Hf for ; Mon, 14 Oct 2024 16:51:28 +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 4XS3Cg4WMgz2rk; Mon, 14 Oct 2024 16:51:27 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1728924687; 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=A3G2pQgxbZhcTPg16ZhNJyHOi0F0QAdVf6diFbYYTYE=; b=niD/rgQI/H19ULAVeArF9nwAWWBQRhHc8rGzLlML3oHvr02sL0gLIi2Lke8HwVgtTgP3zl E1Jyks1fiKl+X+Dg== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1728924687; 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=A3G2pQgxbZhcTPg16ZhNJyHOi0F0QAdVf6diFbYYTYE=; b=hLgJguAPii2Hpk0Y3wJJEhttWs98cKI0SnT9kbQx2oZw+4aEI6hRc45ZeyQu+rpE5vKky7 I3jA6tt9sSmoKtbUBRVzldfH2RR3wwBTxfWJqX3Iux1D8oRzurtHDhfr+164qCPlazsEyP R93BBBOA7ZMS54MlHWaPJS7AbZ+alZ/VfiNOhgPpuU92jWeu1WkzU9OPLk/rbB/jEqkytF YsdIwlGJDU6X1EkTclFDbLEdHdl2FO24QRYMrNWe08xgVJJKA6RfD/vkj8ssII4TkBMS+h hYW/RVGzB5SGoY6BgffYLJR43m7QhDUUqiwqY3m3JQyl6DneZH9rYjyqXEuF0Q== From: Adolf Belka To: development@lists.ipfire.org Subject: [PATCH 17/17] samba: Modification to disable cups for samba build and install Date: Mon, 14 Oct 2024 18:51:17 +0200 Message-ID: <20241014165117.15440-17-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: GZIICOTZPD3W4WJWTUCFILG54CE36KEQ X-Message-ID-Hash: GZIICOTZPD3W4WJWTUCFILG54CE36KEQ 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 - disable cups for the samba configure stage - Update of rootfiles - Update of samba.cgi to remove the printing of a printer share into the samba configuration file. - Tested out on vm system. Installed samba with only avahi, perl-Parse-Yapp, perl-JSON and wsdd as dependencies. Installed without any problems. Existing share was able to be accessed without any problems and a new share was created and was also able to be accessed without problems. Tested-by: Adolf Belka Signed-off-by: Adolf Belka --- config/rootfiles/packages/aarch64/samba | 1 - config/rootfiles/packages/riscv64/samba | 3 +-- config/rootfiles/packages/x86_64/samba | 1 - html/cgi-bin/samba.cgi | 11 +---------- lfs/samba | 6 +++--- 5 files changed, 5 insertions(+), 17 deletions(-) diff --git a/config/rootfiles/packages/aarch64/samba b/config/rootfiles/packages/aarch64/samba index cb7407504..b18c92f38 100644 --- a/config/rootfiles/packages/aarch64/samba +++ b/config/rootfiles/packages/aarch64/samba @@ -998,7 +998,6 @@ usr/libexec/samba/rpcd_spoolss usr/libexec/samba/rpcd_winreg usr/libexec/samba/samba-bgqd usr/libexec/samba/samba-dcerpcd -usr/libexec/samba/smbspool_krb5_wrapper usr/sbin/eventlogadm usr/sbin/nmbd usr/sbin/samba-change-password diff --git a/config/rootfiles/packages/riscv64/samba b/config/rootfiles/packages/riscv64/samba index b530ea2b2..e040073fb 100644 --- a/config/rootfiles/packages/riscv64/samba +++ b/config/rootfiles/packages/riscv64/samba @@ -998,7 +998,6 @@ usr/libexec/samba/rpcd_spoolss usr/libexec/samba/rpcd_winreg usr/libexec/samba/samba-bgqd usr/libexec/samba/samba-dcerpcd -usr/libexec/samba/smbspool_krb5_wrapper usr/sbin/eventlogadm usr/sbin/nmbd usr/sbin/samba-change-password @@ -1024,4 +1023,4 @@ var/log/samba var/spool/samba srv/web/ipfire/cgi-bin/samba.cgi var/ipfire/menu.d/EX-samba.menu -usr/local/bin/sambactrl \ No newline at end of file +usr/local/bin/sambactrl diff --git a/config/rootfiles/packages/x86_64/samba b/config/rootfiles/packages/x86_64/samba index e720457a3..dc0e2bdc4 100644 --- a/config/rootfiles/packages/x86_64/samba +++ b/config/rootfiles/packages/x86_64/samba @@ -998,7 +998,6 @@ usr/libexec/samba/rpcd_spoolss usr/libexec/samba/rpcd_winreg usr/libexec/samba/samba-bgqd usr/libexec/samba/samba-dcerpcd -usr/libexec/samba/smbspool_krb5_wrapper usr/sbin/eventlogadm usr/sbin/nmbd usr/sbin/samba-change-password diff --git a/html/cgi-bin/samba.cgi b/html/cgi-bin/samba.cgi index 5736ef0b8..e67f22541 100644 --- a/html/cgi-bin/samba.cgi +++ b/html/cgi-bin/samba.cgi @@ -2,7 +2,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2005-2013 IPFire Team # +# Copyright (C) 2005-2024 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 # @@ -785,15 +785,6 @@ if (-e "${General::swroot}/samba/smb.conf.local") { close(LOCAL); } -print FILE <