Adding upstream version 1.57.0+dfsg.upstream/1.57.0+dfsgupstream

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

6 files changed, 26 insertions, 13 deletions

diff --git a/uAssets/.github/ISSUE_TEMPLATE/bug_report.yml b/uAssets/.github/ISSUE_TEMPLATE/bug_report.yml
index f28160e..4400fe5 100644
--- a/uAssets/.github/ISSUE_TEMPLATE/bug_report.yml
+++ b/uAssets/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -10,7 +10,7 @@ body:
       description: |
         **IMPORTANT:** Answer carefully and truthfully.
       options:
-        - label: This is **NOT** a [_YouTube_](https://www.github.com/uBlockOrigin/uAssets/issues/20586), [_Facebook_](https://www.github.com/uBlockOrigin/uAssets/issues/3367) or [_Twitch_](https://www.github.com/uBlockOrigin/uAssets/issues/5184) report. _These sites MUST be reported by clicking their **respective links**_.
+        - label: This is **NOT** a [_YouTube_](https://www.github.com/uBlockOrigin/uAssets/issues/20586), [_Facebook_](https://www.github.com/uBlockOrigin/uAssets/issues/3367), [_Twitch_](https://www.github.com/uBlockOrigin/uAssets/issues/5184) or [_a shortener/hosting site_](https://github.com/uBlockOrigin/uAssets/discussions/17361) report. _These sites MUST be reported by clicking their **respective links**_.
           required: true
         - label: I read and understand the [policy about what is a valid filter issue](https://github.com/uBlockOrigin/uAssets/blob/master/README.md#uassets).
           required: true
@@ -22,9 +22,13 @@ body:
           required: true
         - label: I do not have custom filters/rules, or I have verified that the issue still occurs without custom filters/rules.
           required: true
-        - label: I am not using uBlock Origin (uBO) along with other content blocker extensions.
+        - label: I am not using uBlock Origin along with other content blockers.
           required: true
-        - label: I have verified that the web browser's built-in blocker or [DNS blocking](https://en.wikipedia.org/wiki/DNS_blocking) (standalone or through a VPN) is not causing the issue.
+        - label: I have verified that the web browser's built-in content blocker/tracking protection, [network wide/DNS blocking](https://en.wikipedia.org/wiki/DNS_blocking), or my VPN is not causing the issue.
+          required: true
+        - label: I have verified that other extensions are not causing the issue.
+          required: true
+        - label: If this is about a breakage or detection, I have verified that it is caused by uBlock Origin and isn't a site issue.
           required: true
         - label: I did not answer truthfully to **ALL** the above checkboxes.
           required: false
diff --git a/uAssets/.github/ISSUE_TEMPLATE/report_from_ubo.yml b/uAssets/.github/ISSUE_TEMPLATE/report_from_ubo.yml
index 9282938..724c6e9 100644
--- a/uAssets/.github/ISSUE_TEMPLATE/report_from_ubo.yml
+++ b/uAssets/.github/ISSUE_TEMPLATE/report_from_ubo.yml
@@ -10,7 +10,7 @@ body:
       description: |
         **IMPORTANT:** Answer carefully and truthfully.
       options:
-        - label: This is **NOT** a [_YouTube_](https://www.github.com/uBlockOrigin/uAssets/issues/20586), [_Facebook_](https://www.github.com/uBlockOrigin/uAssets/issues/3367) or [_Twitch_](https://www.github.com/uBlockOrigin/uAssets/issues/5184) report. _These sites MUST be reported by clicking their **respective links**_.
+        - label: This is **NOT** a [_YouTube_](https://www.github.com/uBlockOrigin/uAssets/issues/20586), [_Facebook_](https://www.github.com/uBlockOrigin/uAssets/issues/3367), [_Twitch_](https://www.github.com/uBlockOrigin/uAssets/issues/5184) or [_a shortener/hosting site_](https://github.com/uBlockOrigin/uAssets/discussions/17361) report. _These sites MUST be reported by clicking their **respective links**_.
           required: true
         - label: I read and understand the [policy about what is a valid filter issue](https://github.com/uBlockOrigin/uAssets/blob/master/README.md#uassets).
           required: true
@@ -22,9 +22,13 @@ body:
           required: true
         - label: I do not have custom filters/rules, or I have verified that the issue still occurs without custom filters/rules.
           required: true
-        - label: I am not using uBlock Origin (uBO) along with other content blocker extensions.
+        - label: I am not using uBlock Origin along with other content blockers.
           required: true
-        - label: I have verified that the web browser's built-in blocker or [DNS blocking](https://en.wikipedia.org/wiki/DNS_blocking) (standalone or through a VPN) is not causing the issue.
+        - label: I have verified that the web browser's built-in content blocker/tracking protection, [network wide/DNS blocking](https://en.wikipedia.org/wiki/DNS_blocking), or my VPN is not causing the issue.
+          required: true
+        - label: I have verified that other extensions are not causing the issue.
+          required: true
+        - label: If this is about a breakage or detection, I have verified that it is caused by uBlock Origin and isn't a site issue.
           required: true
         - label: I did not answer truthfully to **ALL** the above checkboxes.
           required: false
diff --git a/uAssets/.github/ISSUE_TEMPLATE/specific_report_from_ubo.yml b/uAssets/.github/ISSUE_TEMPLATE/specific_report_from_ubo.yml
index 3c163c6..e3995e6 100644
--- a/uAssets/.github/ISSUE_TEMPLATE/specific_report_from_ubo.yml
+++ b/uAssets/.github/ISSUE_TEMPLATE/specific_report_from_ubo.yml
@@ -10,7 +10,7 @@ body:
       description: |
         **IMPORTANT:** Answer carefully and truthfully.
       options:
-        - label: This is **NOT** a [_YouTube_](https://www.github.com/uBlockOrigin/uAssets/issues/20586), [_Facebook_](https://www.github.com/uBlockOrigin/uAssets/issues/3367) or [_Twitch_](https://www.github.com/uBlockOrigin/uAssets/issues/5184) report. _These sites MUST be reported by clicking their **respective links**_.
+        - label: This is **NOT** a [_YouTube_](https://www.github.com/uBlockOrigin/uAssets/issues/20586), [_Facebook_](https://www.github.com/uBlockOrigin/uAssets/issues/3367), [_Twitch_](https://www.github.com/uBlockOrigin/uAssets/issues/5184) or [_a shortener/hosting site_](https://github.com/uBlockOrigin/uAssets/discussions/17361) report. _These sites MUST be reported by clicking their **respective links**_.
           required: true
         - label: I read and understand the [policy about what is a valid filter issue](https://github.com/uBlockOrigin/uAssets/blob/master/README.md#uassets).
           required: true
@@ -22,9 +22,13 @@ body:
           required: true
         - label: I do not have custom filters/rules, or I have verified that the issue still occurs without custom filters/rules.
           required: true
-        - label: I am not using uBlock Origin (uBO) along with other content blocker extensions.
+        - label: I am not using uBlock Origin along with other content blockers.
           required: true
-        - label: I have verified that the web browser's built-in blocker or [DNS blocking](https://en.wikipedia.org/wiki/DNS_blocking) (standalone or through a VPN) is not causing the issue.
+        - label: I have verified that the web browser's built-in content blocker/tracking protection, [network wide/DNS blocking](https://en.wikipedia.org/wiki/DNS_blocking), or my VPN is not causing the issue.
+          required: true
+        - label: I have verified that other extensions are not causing the issue.
+          required: true
+        - label: If this is about a breakage or detection, I have verified that it is caused by uBlock Origin and isn't a site issue.
           required: true
         - label: I did not answer truthfully to **ALL** the above checkboxes.
           required: false
diff --git a/uAssets/.github/workflows/main.yml b/uAssets/.github/workflows/main.yml
index 66d82d4..53a8e8f 100644
--- a/uAssets/.github/workflows/main.yml
+++ b/uAssets/.github/workflows/main.yml
@@ -21,7 +21,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Clone uAssets
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
             ref: gh-pages
       - name: Copy filter lists to gh-pages
diff --git a/uAssets/.github/workflows/on-youtube-issue.yml b/uAssets/.github/workflows/on-youtube-issue.yml
index d9b1d7d..f197c16 100644
--- a/uAssets/.github/workflows/on-youtube-issue.yml
+++ b/uAssets/.github/workflows/on-youtube-issue.yml
@@ -1,4 +1,4 @@
-name: Triage Youtube issues
+name: Triage YouTube issues
 
 on:
   issues:
@@ -8,7 +8,7 @@ jobs:
   check-if-youtube:
     name: Close as duplicate
     runs-on: ubuntu-latest
-    if: startsWith(github.event.issue.title, 'youtube.com:')
+    if: startsWith(github.event.issue.title, 'youtube.com:') || startsWith(github.event.issue.title, 'music.youtube.com:')
     permissions:
       issues: write
     steps:
diff --git a/uAssets/.github/workflows/update-easylist.yml b/uAssets/.github/workflows/update-easylist.yml
index 4ae2b72..133f097 100644
--- a/uAssets/.github/workflows/update-easylist.yml
+++ b/uAssets/.github/workflows/update-easylist.yml
@@ -17,7 +17,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Clone uAssets
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Assemble Easylist assets
         run: |
           ./tools/make-easylist.sh
@@ -28,5 +28,6 @@ jobs:
             git config user.email "<>"
             git add -u thirdparties/
             git commit -m "Update Easylist assets"
+            git pull --rebase origin master
             git push origin master
           fi