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 <adolf.belka@ipfire.org>
Signed-off-by: Adolf Belka <adolf.belka@ipfire.org>
Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>

diff --git a/config/rootfiles/packages/aarch64/samba b/config/rootfiles/packages/aarch64/samba
index c4e585d1d50da684d17fca0ed82dc4f4f3f615c8..708d9b42e914f388ebf7551f72ede3d0c4d23e6a 100644 (file)
--- 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 3979501e46ce7b954542e2f913a3eebbb37484f0..b55e3be9f2e740f4e93945cac0fb9555d62dbe0c 100644 (file)
--- 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 dc169322e52319806e958eb7cf61bb38427b213c..a355246bec6f43e1f36aa7b31186d8b49f4ffc19 100644 (file)
--- 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 5736ef0b8bbed80162d9a273ad99752933c18ba8..5a23bf044ef48047ec59250672a4622d93d10b92 100644 (file)
--- 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  <info@ipfire.org>                     #
+# Copyright (C) 2005-2025  IPFire Team  <info@ipfire.org>                     #
 #                                                                             #
 # 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 <<END;
-# Export all printers
-[printers]
-path = /var/spool/samba/
-printable = yes
-
-END
-close FILE;
-
        &General::system("/usr/local/bin/sambactrl", "smbsafeconf");
 }
 

diff --git a/lfs/samba b/lfs/samba
index 39deef55b0077283ee8bf78c38f134409138eade..4a1454db212727cea5cfcb914d7b5ebc28d34b98 100644 (file)
--- a/lfs/samba
+++ b/lfs/samba
@@ -33,9 +33,9 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = samba
-PAK_VER    = 107
+PAK_VER    = 108
 
-DEPS       = avahi cups libtalloc perl-Parse-Yapp perl-JSON wsdd
+DEPS       = avahi libtalloc perl-Parse-Yapp perl-JSON wsdd
 
 SERVICES   = samba
 
@@ -94,7 +94,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
                --with-sendfile-support \
                --with-winbind \
                --enable-avahi \
-               --enable-cups \
+               --disable-cups \
                --enable-fhs \
                --with-syslog \
                --without-smb1-server