From mboxrd@z Thu Jan 1 00:00:00 1970
From: Arne Fitzenreiter <git@ipfire.org>
To: ipfire-scm@lists.ipfire.org
Subject: [git.ipfire.org] IPFire 2.x development tree branch, core132,
updated. 8fad3a5941a1a0553bc3cbd0ad577d9067f3dd6b
Date: Sun, 26 May 2019 15:15:00 +0100
Message-ID: <20190526141500.C310384FDC4@people01.i.ipfire.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============7204022104915390520=="
List-Id: <ipfire-scm.lists.ipfire.org>
--===============7204022104915390520==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable
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, core132 has been updated
via 8fad3a5941a1a0553bc3cbd0ad577d9067f3dd6b (commit)
via fefb5173cf02c6b94f2f199bb342df550752ade0 (commit)
via d0db7550edb51ced239c640dada40db8fa1eacc1 (commit)
from 29abc2d07cf297b5ccf32798d6c3cd7dbecef6b2 (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 8fad3a5941a1a0553bc3cbd0ad577d9067f3dd6b
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Thu May 23 01:50:29 2019 +0100
tor: Depend on libseccomp
=20
Suggested-by: Erik Kapfer <erik.kapfer(a)ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit fefb5173cf02c6b94f2f199bb342df550752ade0
Author: Stefan Schantl <stefan.schantl(a)ipfire.org>
Date: Fri May 24 17:45:33 2019 +0200
ids-functions.pl: Do not delete the whitelist file on rulesdir cleanup.
=20
Fixes #12087.
=20
Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org>
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit d0db7550edb51ced239c640dada40db8fa1eacc1
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Sun May 26 16:05:41 2019 +0200
core132: set correct permissions of security settings file.
=20
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
-----------------------------------------------------------------------
Summary of changes:
config/cfgroot/ids-functions.pl | 3 +++
config/rootfiles/core/132/update.sh | 2 ++
lfs/tor | 4 ++--
3 files changed, 7 insertions(+), 2 deletions(-)
Difference in files:
diff --git a/config/cfgroot/ids-functions.pl b/config/cfgroot/ids-functions.pl
index 5530da11e..88734a3ca 100644
--- a/config/cfgroot/ids-functions.pl
+++ b/config/cfgroot/ids-functions.pl
@@ -572,6 +572,9 @@ sub _cleanup_rulesdir() {
# Skip element if it has config as file extension.
next if ($file =3D~ m/\.config$/);
=20
+ # Skip rules file for whitelisted hosts.
+ next if ("$rulespath/$file" eq $whitelist_file);
+
# Delete the current processed file, if not, exit this function
# and return an error message.
unlink("$rulespath/$file") or return "Could not delete $rulespath/$file. $=
!\n";
diff --git a/config/rootfiles/core/132/update.sh b/config/rootfiles/core/132/=
update.sh
index 982a9d964..979f31925 100644
--- a/config/rootfiles/core/132/update.sh
+++ b/config/rootfiles/core/132/update.sh
@@ -90,6 +90,8 @@ ldconfig
=20
# create main/security file
touch /var/ipfire/main/security
+chmod 755 /var/ipfire/main/security
+chown nobody:nobody /var/ipfire/main/security
=20
# Update Language cache
/usr/local/bin/update-lang-cache
diff --git a/lfs/tor b/lfs/tor
index 9b3416450..ab28a848d 100644
--- a/lfs/tor
+++ b/lfs/tor
@@ -32,9 +32,9 @@ DL_FROM =3D $(URL_IPFIRE)
DIR_APP =3D $(DIR_SRC)/$(THISAPP)
TARGET =3D $(DIR_INFO)/$(THISAPP)
PROG =3D tor
-PAK_VER =3D 37
+PAK_VER =3D 38
=20
-DEPS =3D ""
+DEPS =3D "libseccomp"
=20
############################################################################=
###
# Top-level Rules
hooks/post-receive
--
IPFire 2.x development tree
--===============7204022104915390520==--