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 4hXK3n6XVCz36Wb for ; Sat, 29 Aug 2026 15:31:33 +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 "YR2" (not verified)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4hXK3k3RT2z2xVL for ; Sat, 29 Aug 2026 15:31:30 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail01.ipfire.org (Postfix) with ESMTPSA id 4hXK3X1z2Qz6mf; Sat, 29 Aug 2026 15:31:20 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1788017480; 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=KF6gew1V2DaDhBq3oLWR+e4l57nFsU0Z4IL3ttjd59Q=; b=Ky7uhtNBm1qPwlSyiR50jkaSn3/KuXVQPm/iicCQ0wD1kAvnnV6yb4xqQaS8co/3JHrHde HRN9cuSMmB1IeYBA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1788017480; 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=KF6gew1V2DaDhBq3oLWR+e4l57nFsU0Z4IL3ttjd59Q=; b=sCU6443EdEK91m0k+y/ycP6uEgdE6G+O0nzkxE08XNHv09L7B1rm50yRqjxPrJHX7g6TOp p/66Yh5GrVWhsmOO08ZmTlZ/xpwvLs0hDqiDdwoIRB4ZR5Ptq8XeeqH7b+ZkToLptM60UI DPxeH5GyTY7l52qN3EmR8mXyL/OBvmy7bT4CwN5Rte5nXNK8yLhsadIeW7jEfgn5x7fbgS nb0V/+H/0DC2xYkXIwJ2XbDoWENQwznBoAGLTXLQIewOocEevKSkUjNiqPtWQ8+50TVX6k uKnb2J1tbvvQFbkcfA7ppcfAxnES4yl11wHDgdW3vdKu0VyhRePOigjA8IYIZg== Content-Type: text/plain; charset=utf-8 Precedence: list List-Id: List-Subscribe: , List-Unsubscribe: , List-Post: List-Help: Sender: Mail-Followup-To: Mime-Version: 1.0 Subject: Re: [PATCH] urlfilter: Remove bundled Toulouse blacklist From: Michael Tremer In-Reply-To: <20260827091639.4064898-1-p27m@orange.fr> Date: Sat, 29 Aug 2026 17:31:19 +0200 Cc: development@lists.ipfire.org Content-Transfer-Encoding: quoted-printable Message-Id: <217EBED3-D400-4695-A345-816C7DD47207@ipfire.org> References: <20260827091639.4064898-1-p27m@orange.fr> To: Philippe SCARSELLI Hello Phil, Thank you very much for this patch. I could not quite figure out what you want to achieve with this change. = Is this data being shipped causing some problems? The bug report did not = give me the information I was looking for either. All the best, -Michael > On 27 Aug 2026, at 11:16, Philippe SCARSELLI wrote: >=20 > Related to bug 13969 - CU201: restore URLFilter with the Toulouse = list. > To avoid future changes to the list=E2=80=94as happened during = CU201=E2=80=94 >=20 > here is a proposed fix >=20 > Remove the bundled Toulouse blacklist archive and create an empty > blacklists directory instead. >=20 > During upgrades, detect installations that still contain the bundled > blacklist and remove it while preserving the custom blacklist. Updated > blacklists are preserved. >=20 > When restoring a backup, remove previous blacklist entries while = keeping > the custom blacklist to prevent clashes between files and symlinks. >=20 > Tested upgrades from CU204 with the bundled, Toulouse, and IPFire DBL > blacklists, backup restoration from CU203, and a fresh CU205 > installation. >=20 > Note: The patch was generated using "git format-patch --no-binary" to = avoid including the 329 KB binary blacklist archive in the email. > The patch shows the deletion of config/urlfilter/blacklists.tar.gz, = but does not contain the binary data itself. > Therefore, the file must be deleted separately when applying the = patch. >=20 > Signed-off-by: Philippe SCARSELLI > --- > config/backup/backup.pl | 5 ++- > config/rootfiles/common/squidguard | 55 ---------------------------- > config/rootfiles/core/205/update.sh | 11 ++++++ > config/urlfilter/blacklists.tar.gz | Bin 329408 -> 0 bytes > lfs/squidguard | 2 +- > 5 files changed, 16 insertions(+), 57 deletions(-) > delete mode 100644 config/urlfilter/blacklists.tar.gz >=20 > diff --git a/config/backup/backup.pl b/config/backup/backup.pl > index f948c4d21..ec15b2910 100644 > --- a/config/backup/backup.pl > +++ b/config/backup/backup.pl > @@ -85,7 +85,10 @@ restore_backup() { >=20 > # remove all previous blacklist entries from urlfilter > # to prevent any clashes between symlinks and files > - rm -Rf /var/ipfire/urlfilter/blacklists/* > + find /var/ipfire/urlfilter/blacklists -mindepth 1 \ > + ! -path '/var/ipfire/urlfilter/blacklists/custom' \ > + ! -path '/var/ipfire/urlfilter/blacklists/custom/*' \ > + -exec rm -rf {} + >=20 > # Extract backup > if ! tar xvzpf "${filename}" -C / \ > diff --git a/config/rootfiles/common/squidguard = b/config/rootfiles/common/squidguard > index 389f03787..8c895062c 100644 > --- a/config/rootfiles/common/squidguard > +++ b/config/rootfiles/common/squidguard > @@ -11,21 +11,6 @@ var/ipfire/urlfilter/bin/autoupdate.pl > var/ipfire/urlfilter/bin/prebuild.pl > var/ipfire/urlfilter/blacklists > #var/ipfire/urlfilter/blacklists/README > -#var/ipfire/urlfilter/blacklists/ads > -#var/ipfire/urlfilter/blacklists/ads/domains > -#var/ipfire/urlfilter/blacklists/ads/domains.db > -#var/ipfire/urlfilter/blacklists/ads/urls > -#var/ipfire/urlfilter/blacklists/ads/urls.db > -#var/ipfire/urlfilter/blacklists/aggressive > -#var/ipfire/urlfilter/blacklists/aggressive/domains > -#var/ipfire/urlfilter/blacklists/aggressive/domains.db > -#var/ipfire/urlfilter/blacklists/aggressive/urls > -#var/ipfire/urlfilter/blacklists/aggressive/urls.db > -#var/ipfire/urlfilter/blacklists/audio-video > -#var/ipfire/urlfilter/blacklists/audio-video/domains > -#var/ipfire/urlfilter/blacklists/audio-video/domains.db > -#var/ipfire/urlfilter/blacklists/audio-video/urls > -#var/ipfire/urlfilter/blacklists/audio-video/urls.db > #var/ipfire/urlfilter/blacklists/custom > #var/ipfire/urlfilter/blacklists/custom/allowed > #var/ipfire/urlfilter/blacklists/custom/allowed/domains > @@ -33,46 +18,6 @@ var/ipfire/urlfilter/blacklists > #var/ipfire/urlfilter/blacklists/custom/blocked > #var/ipfire/urlfilter/blacklists/custom/blocked/domains > #var/ipfire/urlfilter/blacklists/custom/blocked/urls > -#var/ipfire/urlfilter/blacklists/drugs > -#var/ipfire/urlfilter/blacklists/drugs/domains > -#var/ipfire/urlfilter/blacklists/drugs/domains.db > -#var/ipfire/urlfilter/blacklists/drugs/urls > -#var/ipfire/urlfilter/blacklists/drugs/urls.db > -#var/ipfire/urlfilter/blacklists/gambling > -#var/ipfire/urlfilter/blacklists/gambling/domains > -#var/ipfire/urlfilter/blacklists/gambling/domains.db > -#var/ipfire/urlfilter/blacklists/gambling/urls > -#var/ipfire/urlfilter/blacklists/gambling/urls.db > -#var/ipfire/urlfilter/blacklists/hacking > -#var/ipfire/urlfilter/blacklists/hacking/domains > -#var/ipfire/urlfilter/blacklists/hacking/domains.db > -#var/ipfire/urlfilter/blacklists/hacking/urls > -#var/ipfire/urlfilter/blacklists/hacking/urls.db > -#var/ipfire/urlfilter/blacklists/mail > -#var/ipfire/urlfilter/blacklists/mail/domains > -#var/ipfire/urlfilter/blacklists/mail/domains.db > -#var/ipfire/urlfilter/blacklists/porn > -#var/ipfire/urlfilter/blacklists/porn/domains > -#var/ipfire/urlfilter/blacklists/porn/domains.db > -#var/ipfire/urlfilter/blacklists/porn/expressions > -#var/ipfire/urlfilter/blacklists/porn/urls > -#var/ipfire/urlfilter/blacklists/porn/urls.db > -#var/ipfire/urlfilter/blacklists/proxy > -#var/ipfire/urlfilter/blacklists/proxy/domains > -#var/ipfire/urlfilter/blacklists/proxy/domains.db > -#var/ipfire/urlfilter/blacklists/proxy/urls > -#var/ipfire/urlfilter/blacklists/proxy/urls.db > -#var/ipfire/urlfilter/blacklists/violence > -#var/ipfire/urlfilter/blacklists/violence/domains > -#var/ipfire/urlfilter/blacklists/violence/domains.db > -#var/ipfire/urlfilter/blacklists/violence/expressions > -#var/ipfire/urlfilter/blacklists/violence/urls > -#var/ipfire/urlfilter/blacklists/violence/urls.db > -#var/ipfire/urlfilter/blacklists/warez > -#var/ipfire/urlfilter/blacklists/warez/domains > -#var/ipfire/urlfilter/blacklists/warez/domains.db > -#var/ipfire/urlfilter/blacklists/warez/urls > -#var/ipfire/urlfilter/blacklists/warez/urls.db > var/ipfire/urlfilter/settings > var/ipfire/urlfilter/squidGuard.conf > var/ipfire/urlfilter/version > diff --git a/config/rootfiles/core/205/update.sh = b/config/rootfiles/core/205/update.sh > index 1c4acfbb0..a61f2ff7f 100644 > --- a/config/rootfiles/core/205/update.sh > +++ b/config/rootfiles/core/205/update.sh > @@ -37,6 +37,17 @@ done > rm -rfv \ > /usr/local/bin/unboundctrl >=20 > +# remove old installed blacklist entries from urlfilter > +# The blacklist is no longer installed > +if [ ! -e "/var/ipfire/urlfilter/blacklists/.autoupdate.last" ] && > + [ -f "/var/ipfire/urlfilter/blacklists/README" ] && > + grep -q "(squidGuardRobot)" = "/var/ipfire/urlfilter/blacklists/README"; then > + find /var/ipfire/urlfilter/blacklists -mindepth 1 \ > + ! -path "/var/ipfire/urlfilter/blacklists/custom" \ > + ! -path "/var/ipfire/urlfilter/blacklists/custom/*" \ > + -exec rm -rf {} + > +fi > + > # Extract files > extract_files >=20 > diff --git a/config/urlfilter/blacklists.tar.gz = b/config/urlfilter/blacklists.tar.gz > deleted file mode 100644 > index dc21990be..000000000 > Binary files a/config/urlfilter/blacklists.tar.gz and /dev/null differ > diff --git a/lfs/squidguard b/lfs/squidguard > index 8ad95c472..63eb39125 100644 > --- a/lfs/squidguard > +++ b/lfs/squidguard > @@ -112,7 +112,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) > cp -f $(DIR_CONF)/urlfilter/redirect_wrapper /usr/sbin > chmod 755 /usr/sbin/redirect_wrapper >=20 > - /bin/tar --no-same-owner -xzf = $(DIR_CONF)/urlfilter/blacklists.tar.gz -C /var/ipfire/urlfilter > + -mkdir -p /var/ipfire/urlfilter/blacklists > /usr/bin/perl $(DIR_CONF)/urlfilter/makeconf.pl > touch /var/ipfire/urlfilter/settings > chown -R nobody:nobody /var/ipfire/urlfilter > --=20 > 2.47.3 >=20 >=20