Merge remote-tracking branch 'origin/master' into next

Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>

diff --git a/config/backup/includes/samba b/config/backup/includes/samba
index 1d2166ca56ebd92b7226695a132e79651d693f09..63d61a435d751c7e1a0b591aed7ccfcb87f7336b 100644 (file)
--- a/config/backup/includes/samba
+++ b/config/backup/includes/samba
@@ -4,3 +4,4 @@
 /var/ipfire/samba/settings
 /var/ipfire/samba/shares
 /var/ipfire/samba/smb.conf
+/var/ipfire/samba/smb.conf.local

diff --git a/config/rootfiles/core/153/exclude b/config/rootfiles/core/153/exclude
index e7500a03d20578431240e0adee044496493c47a6..818039f4af91e75f71ab41de8cd55c54b5274a62 100644 (file)
--- a/config/rootfiles/core/153/exclude
+++ b/config/rootfiles/core/153/exclude
@@ -17,6 +17,7 @@ etc/sysconfig/firewall.local
 etc/sysconfig/rc.local
 etc/udev/rules.d/30-persistent-network.rules
 srv/web/ipfire/html/proxy.pac
+usr/share/xt_geoip
 var/ipfire/dma
 var/ipfire/time
 var/ipfire/firewall/locationblock
@@ -25,6 +26,7 @@ var/ipfire/ovpn
 var/ipfire/urlfilter/blacklist
 var/ipfire/urlfilter/settings
 var/lib/alternatives
+var/lib/location/database.db
 var/log/cache
 var/log/dhcpcd.log
 var/log/messages

diff --git a/config/rootfiles/core/153/filelists/libloc b/config/rootfiles/core/153/filelists/libloc
new file mode 120000 (symlink)
index 0000000..ff4a924
--- /dev/null
+++ b/config/rootfiles/core/153/filelists/libloc
@@ -0,0 +1 @@
+../../../common/libloc
\ No newline at end of file

diff --git a/config/rootfiles/oldcore/152/filelists/files b/config/rootfiles/oldcore/152/filelists/files
index 1007ce32ec0fe8384e5e35c2ee471dd9cfe805a7..571dd03983e41a810c1c847d345898bcb8fff7f7 100644 (file)
--- a/config/rootfiles/oldcore/152/filelists/files
+++ b/config/rootfiles/oldcore/152/filelists/files
@@ -8,8 +8,11 @@ etc/rc.d/helper/gcp-setup
 etc/rc.d/helper/oci-setup
 etc/rc.d/init.d/networking/any
 etc/rc.d/init.d/networking/red
+etc/rc.d/init.d/sshd
 srv/web/ipfire/cgi-bin/credits.cgi
 srv/web/ipfire/cgi-bin/logs.cgi/log.dat
 srv/web/ipfire/cgi-bin/proxy.cgi
 usr/local/bin/setaliases
 var/ipfire/graphs.pl
+var/ipfire/header.pl
+var/ipfire/langs

diff --git a/html/cgi-bin/samba.cgi b/html/cgi-bin/samba.cgi
index ec41adc5dd0506b986897074567989902e2b8fc5..6a61300a2ae93b23006f99091048445c7f8336dd 100644 (file)
--- a/html/cgi-bin/samba.cgi
+++ b/html/cgi-bin/samba.cgi
@@ -835,6 +835,18 @@ if ($sambasettings{'ENCRYPTION'} =~ m/(desired|required)/) {
        print FILE "smb encrypt = $1\n";
 }
 
+# Include smb.conf.local
+if (-e "${General::swroot}/samba/smb.conf.local") {
+       open(LOCAL, "<${General::swroot}/samba/smb.conf.local");
+
+       # Copy content line by line
+       while (<LOCAL>) {
+               print FILE $_;
+       }
+
+       close(LOCAL);
+}
+
 print FILE <<END;
 # Export all printers
 [printers]

diff --git a/lfs/samba b/lfs/samba
index 29dfec2e92e985f814d7fea82b1d3079216ab017..f57a04737ef59c77a0cb72d15266ba8469f26e78 100644 (file)
--- a/lfs/samba
+++ b/lfs/samba
@@ -32,7 +32,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = samba
-PAK_VER    = 74
+PAK_VER    = 75
 
 DEPS       = avahi cups libtirpc krb5 perl-Parse-Yapp
 

diff --git a/src/initscripts/system/sshd b/src/initscripts/system/sshd
index 7b4092d38dd62bc6c3381fb6561b57410cdb00dd..c3c02adc1b45056674b3c307320b58b958cb245a 100644 (file)
--- a/src/initscripts/system/sshd
+++ b/src/initscripts/system/sshd
@@ -25,7 +25,7 @@ case "$1" in
 
         [ -e "/var/ipfire/remote/enablessh" ] || exit 0 # SSH is not enabled
         boot_mesg "Starting SSH Server..."
-        loadproc /usr/sbin/sshd 
+        loadproc -f /usr/sbin/sshd
 
         # Also prevent ssh from being killed by out of memory conditions
        (
@@ -37,7 +37,7 @@ case "$1" in
 
     stop)
         boot_mesg "Stopping SSH Server..."
-        killproc /usr/sbin/sshd
+        killproc -p "/var/run/sshd.pid" /usr/sbin/sshd
         ;;
 
     reload)