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, next, updated.
d1e20e8ca7cab5586c328ebf677d1864294d49e8
Date: Sat, 09 May 2020 19:28:03 +0000
Message-ID: <49KHKb4sfFz2xkZ@people01.haj.ipfire.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============4321862372896705774=="
List-Id: <ipfire-scm.lists.ipfire.org>
--===============4321862372896705774==
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, next has been updated
via d1e20e8ca7cab5586c328ebf677d1864294d49e8 (commit)
via 4c1d6ed23b0edc9666fd68d5b80bed844d986977 (commit)
from d561f0d83b105bbcd483dd81812911743d4a5a8b (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 d1e20e8ca7cab5586c328ebf677d1864294d49e8
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Sat May 9 19:27:02 2020 +0000
core145: fix firewall rules.pl path
=20
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit 4c1d6ed23b0edc9666fd68d5b80bed844d986977
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Sat May 9 19:20:02 2020 +0000
berkeley: fix typo
=20
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
-----------------------------------------------------------------------
Summary of changes:
config/rootfiles/core/145/filelists/files | 2 +-
lfs/berkeley | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
Difference in files:
diff --git a/config/rootfiles/core/145/filelists/files b/config/rootfiles/cor=
e/145/filelists/files
index f2b20a0a3..39713eb09 100644
--- a/config/rootfiles/core/145/filelists/files
+++ b/config/rootfiles/core/145/filelists/files
@@ -11,9 +11,9 @@ srv/web/ipfire/cgi-bin/ovpnmain.cgi
srv/web/ipfire/cgi-bin/optionsfw.cgi
srv/web/ipfire/cgi-bin/system.cgi
srv/web/ipfire/cgi-bin/traffic.cgi
+usr/lib/firewall/rules.pl
usr/local/bin/makegraphs
usr/sbin/openvpn-metrics
-var/ipfire/firewall/bin/rules.pl
var/ipfire/menu.d/70-log.menu
var/ipfire/general-functions.pl
var/ipfire/graphs.pl
diff --git a/lfs/berkeley b/lfs/berkeley
index 8b7f8ef5b..72b5f8993 100644
--- a/lfs/berkeley
+++ b/lfs/berkeley
@@ -70,7 +70,7 @@ $(subst %,%_MD5,$(objects)) :
$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
@$(PREBUILD)
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
-- $(UPDATE_AUTOMAKE)
+ $(UPDATE_AUTOMAKE)
cd $(DIR_APP) && sed -i "s/\(__atomic_compare_exchange\)/\1_db/" src/dbinc/=
atomic.h
cd $(DIR_APP)/build_unix && ../dist/configure \
--prefix=3D/usr \
hooks/post-receive
--
IPFire 2.x development tree
--===============4321862372896705774==--