From 9ce7664513091dfec6c770906a1121b7f4a8099a Mon Sep 17 00:00:00 2001 From: Adolf Belka Date: Mon, 14 Oct 2024 18:51:17 +0200 Subject: [PATCH] samba: Modification to disable cups for samba build and install - 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 Signed-off-by: Arne Fitzenreiter --- config/rootfiles/packages/aarch64/samba | 1 - config/rootfiles/packages/riscv64/samba | 1 - config/rootfiles/packages/x86_64/samba | 1 - html/cgi-bin/samba.cgi | 12 +----------- lfs/samba | 6 +++--- 5 files changed, 4 insertions(+), 17 deletions(-) diff --git a/config/rootfiles/packages/aarch64/samba b/config/rootfiles/packages/aarch64/samba index c4e585d1d..708d9b42e 100644 --- a/config/rootfiles/packages/aarch64/samba +++ b/config/rootfiles/packages/aarch64/samba @@ -1001,7 +1001,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 3979501e4..b55e3be9f 100644 --- a/config/rootfiles/packages/riscv64/samba +++ b/config/rootfiles/packages/riscv64/samba @@ -1001,7 +1001,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/x86_64/samba b/config/rootfiles/packages/x86_64/samba index dc169322e..a355246be 100644 --- a/config/rootfiles/packages/x86_64/samba +++ b/config/rootfiles/packages/x86_64/samba @@ -1001,7 +1001,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..5a23bf044 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-2025 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 # @@ -784,16 +784,6 @@ if (-e "${General::swroot}/samba/smb.conf.local") { close(LOCAL); } - -print FILE <