Unexpected change to netwerk/url-classifier/components.conf

We currently make the following change to netwerk/url-classifier/components.conf:

diff --git a/netwerk/url-classifier/components.conf b/netwerk/url-classifier/components.conf
index 401c4cadb2e7..fbc8fd07f13a 100644
--- a/netwerk/url-classifier/components.conf
+++ b/netwerk/url-classifier/components.conf
@@ -18,9 +18,6 @@ Classes = [
         'contract_ids': ['@mozilla.org/url-classifier/exception-list-service;1'],
         'esModule': 'resource://gre/modules/UrlClassifierExceptionListService.sys.mjs',
         'constructor': 'UrlClassifierExceptionListService',
-        'categories': {
-            'idle-daily': 'UrlClassifierExceptionListService'
-        }
     },
     {
         'cid': '{8753A413-3ED6-4A61-A1DC-B31A7E69B796}',

I think this might be a mistake. I.e. we probably don't want to be making any changes to this file.

As far as I can tell, we used to comment out a lot of the components, but we stopped doing this after a fixup 57dfb0ea (tor-browser-140.2.0esr-15.0-1).

This fixup commit was not part of tor-browser-141.0a1-16.0-2 or tor-browser-142.0a1-16.0-2. Moreover, since upstream added f237aed7, our patch was changed in the tor-browser-142.0a1-16.0-1 branch to also remove

        'categories': {
            'idle-daily': 'UrlClassifierExceptionListService'
        }

Therefore, when 57dfb0ea (or a later version from 140) was cherry-picked into tor-browser-143.0a1-16.0-1 as 94871a0f it failed to fully restore the file. Hence we overall still remove the categories line.

We should probably edit the patch to stop removing this line.

/cc @pierov

Assignee Loading
Time tracking Loading