From mboxrd@z Thu Jan  1 00:00:00 1970
From: Peter =?utf-8?q?M=C3=BCller?= <git@ipfire.org>
To: ipfire-scm@lists.ipfire.org
Subject: [git.ipfire.org] IPFire 2.x development tree branch, next, updated.
 763efaf672a27297e274fbe526a3c49ea96904ee
Date: Fri, 02 Sep 2022 06:38:11 +0000
Message-ID: <4MJpBr211Mz2xpV@people01.haj.ipfire.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============5751585092354856826=="
List-Id: <ipfire-scm.lists.ipfire.org>

--===============5751585092354856826==
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  763efaf672a27297e274fbe526a3c49ea96904ee (commit)
      from  336a2a2e25340b038a79eb7699875875ccb18692 (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 763efaf672a27297e274fbe526a3c49ea96904ee
Author: Peter M=C3=BCller <peter.mueller(a)ipfire.org>
Date:   Thu Sep 1 20:30:18 2022 +0000

    configroot: Create "settings" and "modify" files for ipblocklist
   =20
    The third version of this patch conducts the necessary changes in
    configroot. Previously, they took place in ipblocklist itself, which
    would have caused user settings to be overwritten, should ipblocklist be
    shipped in future Core Updates.
   =20
    Fixes: #12917
    Cc: Stefan Schantl <stefan.schantl(a)ipfire.org>
    Signed-off-by: Peter M=C3=BCller <peter.mueller(a)ipfire.org>
    Acked-by: Stefan Schantl <stefan.schantl(a)ipfire.org>

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

Summary of changes:
 config/rootfiles/common/configroot  | 1 +
 config/rootfiles/core/170/update.sh | 4 ++++
 lfs/configroot                      | 6 +++---
 3 files changed, 8 insertions(+), 3 deletions(-)

Difference in files:
diff --git a/config/rootfiles/common/configroot b/config/rootfiles/common/con=
figroot
index 088e87f5b..4d631cea5 100644
--- a/config/rootfiles/common/configroot
+++ b/config/rootfiles/common/configroot
@@ -83,6 +83,7 @@ var/ipfire/location-functions.pl
 var/ipfire/ids-functions.pl
 var/ipfire/ipblocklist-functions.pl
 var/ipfire/ipblocklist
+#var/ipfire/ipblocklist/modified
 #var/ipfire/ipblocklist/settings
 var/ipfire/isdn
 #var/ipfire/isdn/settings
diff --git a/config/rootfiles/core/170/update.sh b/config/rootfiles/core/170/=
update.sh
index b6b66f3f1..9d16f4a32 100644
--- a/config/rootfiles/core/170/update.sh
+++ b/config/rootfiles/core/170/update.sh
@@ -164,6 +164,10 @@ ldconfig
 mkdir -pv /var/lib/ipblocklist
 chown nobody:nobody /var/lib/ipblocklist
=20
+# Create necessary files for IPBlocklist and set their ownership accordingly=
 (#12917)
+touch /var/ipfire/ipblocklist/{settings,modified}
+chown nobody:nobody /var/ipfire/ipblocklist/{settings,modified}
+
 # Rebuild fcrontab from scratch
 /usr/bin/fcrontab -z
=20
diff --git a/lfs/configroot b/lfs/configroot
index 5565bd344..31b9a9463 100644
--- a/lfs/configroot
+++ b/lfs/configroot
@@ -1,7 +1,7 @@
 ############################################################################=
###
 #                                                                           =
  #
 # IPFire.org - A linux based firewall                                       =
  #
-# Copyright (C) 2007-2021  IPFire Team  <info(a)ipfire.org>                 =
    #
+# Copyright (C) 2007-2022  IPFire Team  <info(a)ipfire.org>                 =
    #
 #                                                                           =
  #
 # This program is free software: you can redistribute it and/or modify      =
  #
 # it under the terms of the GNU General Public License as published by      =
  #
@@ -65,8 +65,8 @@ $(TARGET) :
 	    captive/settings captive/agb.txt captive/clients captive/voucher_out ce=
rts/index.txt certs/index.txt.attr ddns/config ddns/settings ddns/ipcache dhc=
p/settings \
 	    dhcp/fixleases dhcp/advoptions dhcp/dhcpd.conf.local dns/settings dns/s=
ervers dnsforward/config ethernet/aliases ethernet/settings ethernet/known_ni=
cs ethernet/scanned_nics \
 	    ethernet/wireless extrahd/scan extrahd/devices extrahd/partitions extra=
hd/settings firewall/settings firewall/config firewall/locationblock firewall=
/input firewall/outgoing \
-	    fwhosts/customnetworks fwhosts/customhosts fwhosts/customgroups fwhosts=
/customservicegrp fwhosts/customlocationgrp fwlogs/ipsettings fwlogs/portsett=
ings ipblocklist/settings \
-	    isdn/settings mac/settings main/hosts main/routing main/security main/s=
ettings optionsfw/settings \
+	    fwhosts/customnetworks fwhosts/customhosts fwhosts/customgroups fwhosts=
/customservicegrp fwhosts/customlocationgrp fwlogs/ipsettings fwlogs/portsett=
ings ipblocklist/modified \
+	    ipblocklist/settings isdn/settings mac/settings main/hosts main/routing=
 main/security main/settings optionsfw/settings \
 	    ovpn/ccd.conf ovpn/ccdroute ovpn/ccdroute2 pakfire/settings portfw/conf=
ig ppp/settings-1 ppp/settings-2 ppp/settings-3 ppp/settings-4 \
 	    ppp/settings-5 ppp/settings proxy/settings proxy/squid.conf proxy/advan=
ced/settings proxy/advanced/cre/enable remote/settings qos/settings qos/class=
es qos/subclasses qos/level7config qos/portconfig \
 	    qos/tosconfig suricata/settings vpn/config vpn/settings vpn/ipsec.conf \


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

--===============5751585092354856826==--