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 8a2105b2844fdb4b2306a0a27553f01842795535 (commit)
via 1f3f2d676eff32f20d32f7ecfea45f235c9355fa (commit)
from aa81aaf83646a9cbaf07f0e5358fee66ef6e4c06 (commit)
Those revisions listed above that are new to this repository have
not appeared on any …
[View More]other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 8a2105b2844fdb4b2306a0a27553f01842795535
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Tue Oct 27 18:38:35 2020 +0000
core153: Ship updated index.cgi and vpnmain.cgi
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 1f3f2d676eff32f20d32f7ecfea45f235c9355fa
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Tue Mar 31 09:54:42 2020 +0000
IPsec: Fix showing tunnels as connecting when they are established
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
-----------------------------------------------------------------------
Summary of changes:
config/rootfiles/core/153/filelists/files | 2 ++
html/cgi-bin/index.cgi | 1 +
html/cgi-bin/vpnmain.cgi | 1 +
3 files changed, 4 insertions(+)
Difference in files:
diff --git a/config/rootfiles/core/153/filelists/files b/config/rootfiles/core/153/filelists/files
index b58587e6a..8fd152a6c 100644
--- a/config/rootfiles/core/153/filelists/files
+++ b/config/rootfiles/core/153/filelists/files
@@ -2,3 +2,5 @@ etc/issue
etc/os-release
etc/system-release
srv/web/ipfire/cgi-bin/credits.cgi
+srv/web/ipfire/cgi-bin/index.cgi
+srv/web/ipfire/cgi-bin/vpnmain.cgi
diff --git a/html/cgi-bin/index.cgi b/html/cgi-bin/index.cgi
index 5aec4c594..fdf62361d 100644
--- a/html/cgi-bin/index.cgi
+++ b/html/cgi-bin/index.cgi
@@ -457,6 +457,7 @@ END
if (($line =~ /\"$vpnconfig{$key}[1]\".*IPsec SA established/) || ($line =~/$vpnconfig{$key}[1]\{.*INSTALLED/ )){
$activecolor = $Header::colourgreen;
$activestatus = $Lang::tr{'capsopen'};
+ last;
} elsif ($line =~ /$vpnconfig{$key}[1]\[.*CONNECTING/) {
$activecolor = $Header::colourorange;
$activestatus = $Lang::tr{'vpn connecting'};
diff --git a/html/cgi-bin/vpnmain.cgi b/html/cgi-bin/vpnmain.cgi
index ae5e80d38..db442e111 100644
--- a/html/cgi-bin/vpnmain.cgi
+++ b/html/cgi-bin/vpnmain.cgi
@@ -3019,6 +3019,7 @@ END
($line =~ /$confighash{$key}[1]\{.*INSTALLED/)) {
$col1="bgcolor='${Header::colourgreen}'";
$active = "<b><font color='#FFFFFF'>$Lang::tr{'capsopen'}</font></b>";
+ last;
} elsif ($line =~ /$confighash{$key}[1]\[.*CONNECTING/) {
$col1="bgcolor='${Header::colourorange}'";
$active = "<b><font color='#FFFFFF'>$Lang::tr{'vpn connecting'}</font></b>";
hooks/post-receive
--
IPFire 2.x development tree
[View Less]
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 aa81aaf83646a9cbaf07f0e5358fee66ef6e4c06 (commit)
from 7e5045312cce99db4f9055f3bf08c9edf98ee243 (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, …
[View More]below.
- Log -----------------------------------------------------------------
commit aa81aaf83646a9cbaf07f0e5358fee66ef6e4c06
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Tue Oct 27 18:22:05 2020 +0000
suricata: Link against libatomic on armv5tel
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
-----------------------------------------------------------------------
Summary of changes:
lfs/suricata | 4 ++++
1 file changed, 4 insertions(+)
Difference in files:
diff --git a/lfs/suricata b/lfs/suricata
index e89bf1e63..d47b43d34 100644
--- a/lfs/suricata
+++ b/lfs/suricata
@@ -32,6 +32,10 @@ DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
+ifeq "$(BUILD_ARCH)" "armv5tel"
+ LDFLAGS += -latomic
+endif
+
###############################################################################
# Top-level Rules
###############################################################################
hooks/post-receive
--
IPFire 2.x development tree
[View Less]
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, master has been updated
via 0b9c2434f0becb75029fa8bc665678b11ce7bea1 (commit)
via acc8336f945b66d66fc15417905ce6bf2707876f (commit)
from 201ad7ff80eb8870aab2b903be6eb7aea2adf563 (commit)
Those revisions listed above that are new to this repository have
not appeared on any …
[View More]other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 0b9c2434f0becb75029fa8bc665678b11ce7bea1
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Tue Oct 27 13:32:19 2020 +0000
core152: Ship updated SSH initscript
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit acc8336f945b66d66fc15417905ce6bf2707876f
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Tue Oct 27 14:20:56 2020 +0100
OpenSSH: Fix initscript to actually kill the daemon
The SSH daemon was not terminated properly because killproc
tried to terminate all processes with that name. That caused
that the master daemon respawned some processed which were
therefore not killed because killproc determined a list of
PIDs only once before starting sending signals.
This patch only kills the master process which is being
determined by using sshd's pid file.
That results in all established connections not being
interrupted any more.
Furthermore, the loadproc function checks if any processes
with the given name are already running which could be true
if there are any connections still open.
That check is being disabled with the -f switch and sshd
will always be launched.
"/etc/init.d/sshd stop" might now print FAIL if only the
master process, but no connection processes were terminated.
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
-----------------------------------------------------------------------
Summary of changes:
config/rootfiles/core/152/filelists/files | 1 +
src/initscripts/system/sshd | 4 ++--
2 files changed, 3 insertions(+), 2 deletions(-)
Difference in files:
diff --git a/config/rootfiles/core/152/filelists/files b/config/rootfiles/core/152/filelists/files
index 1007ce32e..8a05052ec 100644
--- a/config/rootfiles/core/152/filelists/files
+++ b/config/rootfiles/core/152/filelists/files
@@ -8,6 +8,7 @@ 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
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
[View Less]
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 74fd04c3351afe83d4c0c727b33403570262c828 (commit)
from a63fe65a2f7cf819b27412c9d635806ebba341e0 (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, …
[View More]below.
- Log -----------------------------------------------------------------
commit 74fd04c3351afe83d4c0c727b33403570262c828
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Tue Oct 27 11:44:34 2020 +0000
samba: Bump package release
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
-----------------------------------------------------------------------
Summary of changes:
lfs/samba | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Difference in files:
diff --git a/lfs/samba b/lfs/samba
index 15f9d10d2..3a2a5bbd4 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 = 71
+PAK_VER = 72
DEPS = avahi cups libtirpc krb5 perl-Parse-Yapp
hooks/post-receive
--
IPFire 2.x development tree
[View Less]
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 a63fe65a2f7cf819b27412c9d635806ebba341e0 (commit)
from ed3ed3d7235c9e049d1c6a6825806e2b4ebc816f (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, …
[View More]below.
- Log -----------------------------------------------------------------
commit a63fe65a2f7cf819b27412c9d635806ebba341e0
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Tue Oct 27 11:37:03 2020 +0000
samba: Make changing shares taking effect immediately
The action was performed after the table has already been
rendered which required reloading the page to show a new
share.
This has now been moved to the top so that new changes
will be shown immediately.
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
-----------------------------------------------------------------------
Summary of changes:
html/cgi-bin/samba.cgi | 47 +++++++++++++++++++++++++----------------------
1 file changed, 25 insertions(+), 22 deletions(-)
Difference in files:
diff --git a/html/cgi-bin/samba.cgi b/html/cgi-bin/samba.cgi
index be670a95e..ec41adc5d 100644
--- a/html/cgi-bin/samba.cgi
+++ b/html/cgi-bin/samba.cgi
@@ -44,7 +44,7 @@ my $userfile = "${General::swroot}/samba/private/smbpasswd";
my %selected= () ;
my $defaultoption= "[My Share]\npath = \ncomment = Share - Public Access\nbrowseable = yes\nwriteable = yes\ncreate mask = 0644\ndirectory mask = 0755\npublic = yes\nforce user = samba";
-my %shares = ();
+my %shares = &config("${General::swroot}/samba/shares");
&General::readhash("${General::swroot}/ethernet/settings", \%netsettings);
&General::readhash("${General::swroot}/main/settings", \%mainsettings);
@@ -97,6 +97,30 @@ if ($sambasettings{'ACTION'} eq 'join') {
$message .= &joindomain($sambasettings{'USERNAME'}, $sambasettings{'PASSWORD'});
}
+if ($sambasettings{'ACTION'} eq 'smbshareadd') {
+ $shares{'xvx'} = $sambasettings{'SHAREOPTION'};
+ &save("shares");
+
+ # Reload configuration
+ %shares = config("${General::swroot}/samba/shares");
+}
+
+if ($sambasettings{'ACTION'} eq 'smbsharedel') {
+ delete $shares{$sambasettings{'NAME'}};
+ &save("shares");
+
+ # Reload configuration
+ %shares = config("${General::swroot}/samba/shares");
+}
+
+if ($sambasettings{'ACTION'} eq 'smbsharechange') {
+ $shares{$sambasettings{'NAME'}} = $sambasettings{'SHAREOPTION'};
+ &save("shares");
+
+ # Reload configuration
+ %shares = config("${General::swroot}/samba/shares");
+}
+
############################################################################################################################
########################################### Samba Benutzer oder PC l�chen #################################################
@@ -538,8 +562,6 @@ END
&Header::openbox('100%', 'center', $Lang::tr{'shares'});
-my %shares = config("${General::swroot}/samba/shares");
-
print <<END;
<table class="tbl" width='100%' cellspacing='0'>
<tr>
@@ -654,25 +676,6 @@ if ($sambasettings{'ACTION'} eq 'sharechange') {
END
}
-if ($sambasettings{'ACTION'} eq 'smbshareadd')
- {
- $shares{'xvx'}= "$sambasettings{'SHAREOPTION'}";
- save("shares");
- my $shares = config("${General::swroot}/samba/shares");
- }
-if ($sambasettings{'ACTION'} eq 'smbsharedel')
- {
- delete $shares{$sambasettings{'NAME'}};
- save("shares");
- my %shares = config("${General::swroot}/samba/shares");
- }
-if ($sambasettings{'ACTION'} eq 'smbsharechange')
- {
- $shares{$sambasettings{'NAME'}} = $sambasettings{'SHAREOPTION'};
- save("shares");
- my %shares = config("${General::swroot}/samba/shares");
- }
-
&Header::closebox();
############################################################################################################################
hooks/post-receive
--
IPFire 2.x development tree
[View Less]
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 tag, v2.25-core150 has been created
at d328c232d7df7bf3f8582388f428c47a92fab0c1 (commit)
- Log -----------------------------------------------------------------
commit d328c232d7df7bf3f8582388f428c47a92fab0c1
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Mon Sep 28 10:27:24 2020 +…
[View More]0000
credits.cgi: update contributors
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
-----------------------------------------------------------------------
hooks/post-receive
--
IPFire 2.x development tree
[View Less]
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, master has been updated
via f29f169735ff3b431c6dc7cb50b36d0fe644163b (commit)
from c9f30dc9fc9932da3c0aabd83dc260a5eeac9218 (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, …
[View More]below.
- Log -----------------------------------------------------------------
commit f29f169735ff3b431c6dc7cb50b36d0fe644163b
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Wed Oct 7 08:04:38 2020 +0000
avahi: Disable custom stack protector configuration
We already pass -fstack-protector-strong, which might be overridden
by -fstack-protector-all. We also know that SSP works in our version
of libc and do not need to link against libssp.
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
-----------------------------------------------------------------------
Summary of changes:
lfs/avahi | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
Difference in files:
diff --git a/lfs/avahi b/lfs/avahi
index 6807a080d..2ed13dd44 100644
--- a/lfs/avahi
+++ b/lfs/avahi
@@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
PROG = avahi
-PAK_VER = 6
+PAK_VER = 7
DEPS = dbus libdaemon
@@ -82,6 +82,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
--sysconfdir=/etc \
--localstatedir=/var \
--with-avahi-user=avahi \
+ --disable-stack-protector \
--disable-qt3 \
--disable-qt4 \
--disable-qt5 \
hooks/post-receive
--
IPFire 2.x development tree
[View Less]