core187: correct the shipping of ipblocklist sources

Message ID 20240715122941.34012-1-adolf.belka@ipfire.org
State Dropped
Headers
Series core187: correct the shipping of ipblocklist sources |

Commit Message

Adolf Belka July 15, 2024, 12:29 p.m. UTC
  Signed-off-by: Adolf Belka <adolf.belka@ipfire.org>
---
 config/rootfiles/core/187/filelists/files               | 1 +
 config/rootfiles/core/187/filelists/ipblocklist-sources | 1 -
 2 files changed, 1 insertion(+), 1 deletion(-)
 delete mode 120000 config/rootfiles/core/187/filelists/ipblocklist-sources
  

Comments

Adolf Belka July 15, 2024, 1 p.m. UTC | #1
Fixes: Bug13726

On 15/07/2024 14:29, Adolf Belka wrote:
> Signed-off-by: Adolf Belka <adolf.belka@ipfire.org>
> ---
>   config/rootfiles/core/187/filelists/files               | 1 +
>   config/rootfiles/core/187/filelists/ipblocklist-sources | 1 -
>   2 files changed, 1 insertion(+), 1 deletion(-)
>   delete mode 120000 config/rootfiles/core/187/filelists/ipblocklist-sources
> 
> diff --git a/config/rootfiles/core/187/filelists/files b/config/rootfiles/core/187/filelists/files
> index d234de053..dda00abc1 100644
> --- a/config/rootfiles/core/187/filelists/files
> +++ b/config/rootfiles/core/187/filelists/files
> @@ -6,3 +6,4 @@ srv/web/ipfire/cgi-bin/firewall.cgi
>   srv/web/ipfire/cgi-bin/vpnmain.cgi
>   usr/lib/firewall/rules.pl
>   var/ipfire/header.pl
> +var/ipfire/ipblocklist/sources
> diff --git a/config/rootfiles/core/187/filelists/ipblocklist-sources b/config/rootfiles/core/187/filelists/ipblocklist-sources
> deleted file mode 120000
> index 31e200d14..000000000
> --- a/config/rootfiles/core/187/filelists/ipblocklist-sources
> +++ /dev/null
> @@ -1 +0,0 @@
> -../../../common/ipblocklist-sources
> \ No newline at end of file
  
Adolf Belka July 16, 2024, 11:51 a.m. UTC | #2
Hi All,

Please ignore this patch submission. I have closed the bug as an errata.

I managed to evaluate CU187 Testing on my vm systems without remembering to actually run the update to Testing. So I have been evaluating CU187 Testing on two CU186 systems for the last few days since the release was made.

Duuuuh.

Doing the actual update to CU187 Testing, I found that the ipblocklist sources file had been updated with the new sources.

Sorry for the noise.

I will also clear out the patch submission in patchwork.

Really sorry,

Adolf.


On 15/07/2024 15:00, Adolf Belka wrote:
> Fixes: Bug13726
>
> On 15/07/2024 14:29, Adolf Belka wrote:
>> Signed-off-by: Adolf Belka <adolf.belka@ipfire.org>
>> ---
>>   config/rootfiles/core/187/filelists/files               | 1 +
>>   config/rootfiles/core/187/filelists/ipblocklist-sources | 1 -
>>   2 files changed, 1 insertion(+), 1 deletion(-)
>>   delete mode 120000 config/rootfiles/core/187/filelists/ipblocklist-sources
>>
>> diff --git a/config/rootfiles/core/187/filelists/files b/config/rootfiles/core/187/filelists/files
>> index d234de053..dda00abc1 100644
>> --- a/config/rootfiles/core/187/filelists/files
>> +++ b/config/rootfiles/core/187/filelists/files
>> @@ -6,3 +6,4 @@ srv/web/ipfire/cgi-bin/firewall.cgi
>>   srv/web/ipfire/cgi-bin/vpnmain.cgi
>>   usr/lib/firewall/rules.pl
>>   var/ipfire/header.pl
>> +var/ipfire/ipblocklist/sources
>> diff --git a/config/rootfiles/core/187/filelists/ipblocklist-sources b/config/rootfiles/core/187/filelists/ipblocklist-sources
>> deleted file mode 120000
>> index 31e200d14..000000000
>> --- a/config/rootfiles/core/187/filelists/ipblocklist-sources
>> +++ /dev/null
>> @@ -1 +0,0 @@
>> -../../../common/ipblocklist-sources
>> \ No newline at end of file
>
  

Patch

diff --git a/config/rootfiles/core/187/filelists/files b/config/rootfiles/core/187/filelists/files
index d234de053..dda00abc1 100644
--- a/config/rootfiles/core/187/filelists/files
+++ b/config/rootfiles/core/187/filelists/files
@@ -6,3 +6,4 @@  srv/web/ipfire/cgi-bin/firewall.cgi
 srv/web/ipfire/cgi-bin/vpnmain.cgi
 usr/lib/firewall/rules.pl
 var/ipfire/header.pl
+var/ipfire/ipblocklist/sources
diff --git a/config/rootfiles/core/187/filelists/ipblocklist-sources b/config/rootfiles/core/187/filelists/ipblocklist-sources
deleted file mode 120000
index 31e200d14..000000000
--- a/config/rootfiles/core/187/filelists/ipblocklist-sources
+++ /dev/null
@@ -1 +0,0 @@ 
-../../../common/ipblocklist-sources
\ No newline at end of file