From: Arne Fitzenreiter <git@ipfire.org>
To: ipfire-scm@lists.ipfire.org
Subject: [git.ipfire.org] IPFire 2.x development tree branch, next, updated. a832b5c2e6f96bef108457d36945ea5d5fa961b3
Date: Fri, 13 Nov 2020 18:21:51 +0000 [thread overview]
Message-ID: <4CXmyR5BYYz2xph@people01.haj.ipfire.org> (raw)
[-- Attachment #1: Type: text/plain, Size: 5824 bytes --]
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 2.x development tree".
The branch, next has been updated
via a832b5c2e6f96bef108457d36945ea5d5fa961b3 (commit)
via 1e2c442c9e2d11590af214bdddde5cf0506e0a52 (commit)
via 0e42d81285766431f20bd92218d9c427162c96dc (commit)
via 632075bf579d1d706ade996b786f1061244dd6a9 (commit)
via 2d43d770d26bff3cde665bfbb1f7ebbaf2acabfb (commit)
via 0b9c2434f0becb75029fa8bc665678b11ce7bea1 (commit)
via acc8336f945b66d66fc15417905ce6bf2707876f (commit)
via 201ad7ff80eb8870aab2b903be6eb7aea2adf563 (commit)
via f29f169735ff3b431c6dc7cb50b36d0fe644163b (commit)
via c9f30dc9fc9932da3c0aabd83dc260a5eeac9218 (commit)
via b5c4c15af38479627ee20854de8529937de7f4ad (commit)
from 11b46800a5391ca9cffdec29e4c61a0bd32ab419 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit a832b5c2e6f96bef108457d36945ea5d5fa961b3
Merge: 11b46800a 1e2c442c9
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Fri Nov 13 18:20:59 2020 +0000
Merge remote-tracking branch 'origin/master' into next
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
-----------------------------------------------------------------------
Summary of changes:
config/backup/includes/samba | 1 +
config/rootfiles/core/153/exclude | 2 ++
config/rootfiles/{oldcore/148 => core/153}/filelists/libloc | 0
config/rootfiles/oldcore/152/filelists/files | 3 +++
html/cgi-bin/samba.cgi | 12 ++++++++++++
lfs/samba | 2 +-
src/initscripts/system/sshd | 4 ++--
7 files changed, 21 insertions(+), 3 deletions(-)
copy config/rootfiles/{oldcore/148 => core/153}/filelists/libloc (100%)
Difference in files:
diff --git a/config/backup/includes/samba b/config/backup/includes/samba
index 1d2166ca5..63d61a435 100644
--- 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 e7500a03d..818039f4a 100644
--- 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
index 000000000..ff4a92429
--- /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 1007ce32e..571dd0398 100644
--- 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 ec41adc5d..6a61300a2 100644
--- 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 29dfec2e9..f57a04737 100644
--- 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 7b4092d38..c3c02adc1 100644
--- 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)
hooks/post-receive
--
IPFire 2.x development tree
reply other threads:[~2020-11-13 18:21 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=4CXmyR5BYYz2xph@people01.haj.ipfire.org \
--to=git@ipfire.org \
--cc=ipfire-scm@lists.ipfire.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox