From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail02.haj.ipfire.org (localhost [IPv6:::1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4gX7tc11rrz30Sf for ; Fri, 05 Jun 2026 17:37:44 +0000 (UTC) Received: from mail01.ipfire.org (mail01.haj.ipfire.org [IPv6:2001:678:b28::25]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange x25519 server-signature ECDSA (secp384r1 raw public key) server-digest SHA384 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mail01.haj.ipfire.org", Issuer "R12" (not verified)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4gX7tX5nqyz2xP7 for ; Fri, 05 Jun 2026 17:37:40 +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 RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mail01.ipfire.org (Postfix) with ESMTPSA id 4gX7tV3J4QzC6; Fri, 05 Jun 2026 17:37:38 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1780681058; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=HYUDs3BeWXFNSDvmDAJfP0CQVe63e3HMNlF5igdBSsA=; b=FSHgppO4N20KG9ncA/G3mtyUx67uj7WlqyfJiYWoO9ovTkS/UMRolPdRZjARexFqwIrU+Q OxCLjMtE4vUCO8Ag== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1780681058; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=HYUDs3BeWXFNSDvmDAJfP0CQVe63e3HMNlF5igdBSsA=; b=Pwngc9DAMSnbzz0S9E+I0jZyWWIS6AfTdmav1Rm+ppZHWfk0j6XcTVFHKLsvmwhmaew0D3 dwKa0xGkVbWuXnIF5rVwT6S4wAi+pDrxhngVWkERl1DW9mmwojaCdj3UYkZP8yvjsO87bN 4WeqmHhHqNRLlaE23v10adOkjjapJf4Rql0yRlfuF8446ec+V+pDX9m1qx7wKWr4JYwGDp 7Kd8t7AyoM97aLHJZgMRYs/0R1cm/MR4xWYJRDZco6VKVppMqzT9YCmpLlr0TnxpCv0ZLT Tuj8cAR0PHu5pGsYnIhIVEjbkbVLjpJSV4CB3YKU86YBH6bjzNu6NvtXaWYKrg== Message-ID: <4ae8625d-15bc-4c98-a2c7-82604ec3c6f2@ipfire.org> Date: Fri, 5 Jun 2026 19:37:35 +0200 Precedence: list List-Id: List-Subscribe: , List-Unsubscribe: , List-Post: List-Help: Sender: Mail-Followup-To: MIME-Version: 1.0 Subject: Re: [PATCH] backup.pl: Fix issue with University of Toulouse change To: Matthias Fischer , Michael Tremer References: <20260605164020.3661242-1-adolf.belka@ipfire.org> Content-Language: en-GB Cc: "IPFire: Development-List" From: Adolf Belka In-Reply-To: Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit Hi Matthias, On 05/06/2026 18:58, Matthias Fischer wrote: > Hi Adolf, > > just in case no one has seen it yet: you got a typo down there...: > > ... /var/ipfire/urrlfilter/blacklists/ ... > !^^! Oh sugar puffs. Thanks very much for spotting it. That's what comes from testing it on a separate system from doing the patch submission. Hi Michael, Can you easily correct this or should I re-do the patch submission? Regards, Adolf. > > Best > Matthias > > On 05.06.2026 18:40, Adolf Belka wrote: >> - Some months ago University of Toulouse changed any lists with a different French and >> English name from being duplicate files to being a file plus a symlink. >> - Doing a restore from a backup with symlinks into a system with only file names >> resulted in a symlink trying to be created when a file with the same name already >> existed causing a failure. >> - This failure stopped the restore part way through resulting in only a partial restore. >> - This patch removes all entries in the urlfilter blacklists, allowing all restored >> entries to be created. >> >> Signed-off-by: Adolf Belka >> --- >> config/backup/backup.pl | 6 +++++- >> 1 file changed, 5 insertions(+), 1 deletion(-) >> >> diff --git a/config/backup/backup.pl b/config/backup/backup.pl >> index 7454ae762..417d33f40 100644 >> --- a/config/backup/backup.pl >> +++ b/config/backup/backup.pl >> @@ -2,7 +2,7 @@ >> ############################################################################### >> # # >> # IPFire.org - A linux based firewall # >> -# Copyright (C) 2007-2025 IPFire Team # >> +# Copyright (C) 2007-2026 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 # >> @@ -83,6 +83,10 @@ restore_backup() { >> # certificates being left in directory after a restore >> rm -f /var/ipfire/ovpn/certs/* >> >> + # remove all previous blacklist entries from urlfilter >> + # to prevent any clashes between symlinks and files >> + rm -Rf /var/ipfire/urrlfilter/blacklists/* >> + >> # Extract backup >> if ! tar xvzpf "${filename}" -C / \ >> --exclude-from="/var/ipfire/backup/exclude" \ >