From patchwork Thu Sep 1 20:30:18 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Peter_M=C3=BCller?= X-Patchwork-Id: 5988 Return-Path: Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384 client-signature ECDSA (P-384) client-digest SHA384) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 4MJXjs0TdTz3wfK for ; Thu, 1 Sep 2022 20:30:41 +0000 (UTC) Received: from mail02.haj.ipfire.org (mail02.haj.ipfire.org [172.28.1.201]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail02.haj.ipfire.org", Issuer "R3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4MJXjq4BcrzqV; Thu, 1 Sep 2022 20:30:39 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4MJXjq3ZXjz2yF2; Thu, 1 Sep 2022 20:30:39 +0000 (UTC) Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384 client-signature ECDSA (P-384) client-digest SHA384) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4MJXjp0Ln0z2xGQ for ; Thu, 1 Sep 2022 20:30:38 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (No client certificate requested) by mail01.ipfire.org (Postfix) with ESMTPSA id 4MJXjk4n9MzqV for ; Thu, 1 Sep 2022 20:30:33 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1662064236; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=DrrLy5pZ7iHE7YkdaR81oVeNRTE9sfxUlHfiFCjjyp0=; b=27QqvUkvGxBxyuNM52mnC8TxxoKa+TlrZ1OIjwOm9mFZ/gL9vgdKM29Rq9lk4PvQGU9tyX 7pzSwUEUzM3EO+CQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1662064236; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=DrrLy5pZ7iHE7YkdaR81oVeNRTE9sfxUlHfiFCjjyp0=; b=kc0+MoGCUfIarHKI17aFmEZHeCSftzC0cAGDK4Azl5iXnT9hg6mr3g8atjAQXL19cOwlTX ENRR+fXJ16JHB3RJmAwpUnmP1yylyR9ARSrFoW7b0rJgMinOS/3XvFFfJWPqFD7DCGDZsF VMFsQzzyx6OI4jHKT0Q3wHhltgkfg7vTIi5XA1SR3Vxzww2ZY8rqh+hpfs/LbSdGhVY3Ok ounV97gdW8my1QwOBjVqG0tcZjeZGcDCzHSgg3qM+iv3ew+yZTHYcPc7prb2ocAoGmWH9V wgix+tcU+TlhMGh2ayxMIP9M1v7UbW/AEaq6dFsiwzJa8ywu5cQk/3d+MGYX/g== Message-ID: <922a7ccc-8f99-37fd-2b5c-fcad7e22e3f6@ipfire.org> Date: Thu, 1 Sep 2022 20:30:18 +0000 MIME-Version: 1.0 Content-Language: en-US To: "IPFire: Development" From: =?utf-8?q?Peter_M=C3=BCller?= Subject: [PATCH v3] configroot: Create "settings" and "modify" files for ipblocklist X-BeenThere: development@lists.ipfire.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: IPFire development talk List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: development-bounces@lists.ipfire.org Sender: "Development" 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. Fixes: #12917 Cc: Stefan Schantl Signed-off-by: Peter Müller Acked-by: Stefan Schantl --- config/rootfiles/common/configroot | 1 + config/rootfiles/core/170/update.sh | 4 ++++ lfs/configroot | 6 +++--- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/config/rootfiles/common/configroot b/config/rootfiles/common/configroot 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 +# 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 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 # +# Copyright (C) 2007-2022 IPFire Team # # # # 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 certs/index.txt certs/index.txt.attr ddns/config ddns/settings ddns/ipcache dhcp/settings \ dhcp/fixleases dhcp/advoptions dhcp/dhcpd.conf.local dns/settings dns/servers dnsforward/config ethernet/aliases ethernet/settings ethernet/known_nics ethernet/scanned_nics \ ethernet/wireless extrahd/scan extrahd/devices extrahd/partitions extrahd/settings firewall/settings firewall/config firewall/locationblock firewall/input firewall/outgoing \ - fwhosts/customnetworks fwhosts/customhosts fwhosts/customgroups fwhosts/customservicegrp fwhosts/customlocationgrp fwlogs/ipsettings fwlogs/portsettings ipblocklist/settings \ - isdn/settings mac/settings main/hosts main/routing main/security main/settings optionsfw/settings \ + fwhosts/customnetworks fwhosts/customhosts fwhosts/customgroups fwhosts/customservicegrp fwhosts/customlocationgrp fwlogs/ipsettings fwlogs/portsettings 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/config ppp/settings-1 ppp/settings-2 ppp/settings-3 ppp/settings-4 \ ppp/settings-5 ppp/settings proxy/settings proxy/squid.conf proxy/advanced/settings proxy/advanced/cre/enable remote/settings qos/settings qos/classes qos/subclasses qos/level7config qos/portconfig \ qos/tosconfig suricata/settings vpn/config vpn/settings vpn/ipsec.conf \