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 4gX6cW02DPz3362 for ; Fri, 05 Jun 2026 16:40:27 +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) (Client CN "mail01.haj.ipfire.org", Issuer "R12" (not verified)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4gX6cR1wGSz2yTw for ; Fri, 05 Jun 2026 16:40:23 +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 4gX6cQ1R2Fz33; Fri, 05 Jun 2026 16:40:22 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1780677622; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=zScCTG0JtFJQOGsdB1JT4JNNhJVQyIGlm0MpEQ5kDEI=; b=jgI9JRRGW+M1pVw2WP6JBcf9dAGZgBpymVOMAjHJYoW62/RIVi0Z/u0OWfIDpSxqBXkXci j9tKD4okxNnw+xCw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1780677622; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=zScCTG0JtFJQOGsdB1JT4JNNhJVQyIGlm0MpEQ5kDEI=; b=MfnRnVhhIZ58OvsCCuZienc54NnYQyHnuNjg27Rf7+HgvJLN8Cb+grZJZqUy1WaZgVuznm Ctab4YZZrIU2nt7Nj1eCEoxvR/ZHeXF4RyGEGQQCeQCPSl6/V1jBjMTvNlhY/A9ti5ZlKC X6ppqBAXMC9CkhTd2V9lyJai2YYigjgXavsyNP5Hk9rNfjEjcZEWsf+YPYCe6GIzVDlXwh VgvT+nDVKPb9NG5pHf5wOTuzjg5CWFMYy/PNkOoGzgv+ndU6EoLYhls6csvpRaR+EV0RQk 687yLT0AqjxA6OPzj9VsuwKD85TqmO4kWvYiQz8YrqErWlHHBgWPgmYML6dxgw== From: Adolf Belka To: development@lists.ipfire.org Cc: Adolf Belka Subject: [PATCH] backup.pl: Fix issue with University of Toulouse change Date: Fri, 5 Jun 2026 18:40:19 +0200 Message-ID: <20260605164020.3661242-1-adolf.belka@ipfire.org> Precedence: list List-Id: List-Subscribe: , List-Unsubscribe: , List-Post: List-Help: Sender: Mail-Followup-To: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit - 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" \ -- 2.54.0