From mboxrd@z Thu Jan  1 00:00:00 1970
From: Michael Tremer <git@ipfire.org>
To: ipfire-scm@lists.ipfire.org
Subject: [git.ipfire.org] IPFire 2.x development tree branch, master, updated.
 3d947e6e6b9f492fa0a12b40db0495b6eac6d967
Date: Tue, 26 Mar 2024 10:55:38 +0000
Message-ID: <4V3mtL6w5Zz2xQk@people01.haj.ipfire.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============5484981754857009632=="
List-Id: <ipfire-scm.lists.ipfire.org>

--===============5484981754857009632==
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, master has been updated
       via  3d947e6e6b9f492fa0a12b40db0495b6eac6d967 (commit)
      from  2e94953dd40134d05d3dd93c9c3e125f5ec427f9 (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 3d947e6e6b9f492fa0a12b40db0495b6eac6d967
Author: Adolf Belka <adolf.belka(a)ipfire.org>
Date:   Mon Mar 25 18:44:56 2024 +0100

    CU185-update.sh: Add drop hostile in & out logging entries if not already=
 present
   =20
    - This v2 patch corrects that the previous script was looking for =3Don. =
If a user had
       modified the preferences to change it to =3Doff then the script would =
have resulted in
       both =3Don and =3Doff versions being in the settings file.
    - This patch ensures that those people who updated to CU184 before the CU=
184-update.sh
       patch fix to add the logging entries was added will get their optionsf=
w settings file
       correctly updated with CU185
    - This only adds the LOGDROPHOSTILEIN & LOGDROPHOSTILEOUT entries if they=
 do not already
       exist in the optionsfw settings file.
    - This change also does the check for LOGDROPHOSTILEIN and LOGDROPHOSTILE=
OUT as two
       separate checks and then runs the firewall update command
   =20
    Tested-by: Adolf Belka <adolf.belka(a)ipfire.org>
    Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org>
    Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>

-----------------------------------------------------------------------

Summary of changes:
 config/rootfiles/core/185/update.sh | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

Difference in files:
diff --git a/config/rootfiles/core/185/update.sh b/config/rootfiles/core/185/=
update.sh
index ec4d8ab82..002f92bbb 100644
--- a/config/rootfiles/core/185/update.sh
+++ b/config/rootfiles/core/185/update.sh
@@ -117,11 +117,17 @@ chown nobody:nobody /var/ipfire/ovpn/ovpnconfig
=20
 # Check if the drop hostile in and out logging options need to be added
 # into the optionsfw settings file and apply to firewall
-if ! [ $(grep "LOGDROPHOSTILEIN=3Don" /var/ipfire/optionsfw/settings) ] && \
-   ! [ $(grep "LOGDROPHOSTILEOUT=3Don" /var/ipfire/optionsfw/settings) ]; th=
en
-        sed -i '$ a\LOGDROPHOSTILEIN=3Don' /var/ipfire/optionsfw/settings
-        sed -i '$ a\LOGDROPHOSTILEOUT=3Don' /var/ipfire/optionsfw/settings
-        /usr/local/bin/firewallctrl
+optionsfw=3D""
+if ! [ $(grep "^LOGDROPHOSTILEIN=3D" /var/ipfire/optionsfw/settings) ]; then
+    sed -i '$ a\LOGDROPHOSTILEIN=3Don' /var/ipfire/optionsfw/settings
+    optionsfw=3D"updated"
+fi
+if ! [ $(grep "^LOGDROPHOSTILEOUT=3D" /var/ipfire/optionsfw/settings) ]; then
+    sed -i '$ a\LOGDROPHOSTILEOUT=3Don' /var/ipfire/optionsfw/settings
+    optionsfw=3D"updated"
+fi
+if ! [ -z "$optionsfw" ]; then
+    /usr/local/bin/firewallctrl
 fi
=20
 # Rebuild initial ramdisks


hooks/post-receive
--
IPFire 2.x development tree

--===============5484981754857009632==--