From be47f8d159e5910103380458755e9a3eff29a79e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Luis=20Guzm=C3=A1n?= <ark@switnet.org>
Date: Sun, 29 Jan 2023 08:33:29 +0000
Subject: [PATCH] firefox: rollback DuckDuckGo/Firefox partnership search codes
---
...llback_ddg_firefox_partnership_codes.patch | 44 +++++++++++++++++++
helpers/make-firefox | 6 +--
2 files changed, 47 insertions(+), 3 deletions(-)
create mode 100644 helpers/DATA/firefox/rollback_ddg_firefox_partnership_codes.patch
diff --git a/helpers/DATA/firefox/rollback_ddg_firefox_partnership_codes.patch b/helpers/DATA/firefox/rollback_ddg_firefox_partnership_codes.patch
new file mode 100644
index 00000000..bfa66b28
--- /dev/null
+++ b/helpers/DATA/firefox/rollback_ddg_firefox_partnership_codes.patch
@@ -0,0 +1,44 @@
+More info related to the change: https://hg.mozilla.org/mozilla-central/rev/5079bb7577182734823d6e4a3c468115d45a9dd9
+
+diff -Nru firefox-109.0.1+build1-0ubuntu0.22.04.1~mt1+11.0trisquel94/browser/components/search/extensions/ddg/manifest.json firefox-109.0+build2/browser/components/search/extensions/ddg/manifest.json
+--- firefox-109.0.1+build1-0ubuntu0.22.04.1~mt1+11.0trisquel94/browser/components/search/extensions/ddg/manifest.json 2023-01-29 00:04:37.557029994 -0600
++++ firefox-109.0+build2/browser/components/search/extensions/ddg/manifest.json 2023-01-14 12:40:57.000000000 -0600
+@@ -2,7 +2,7 @@
+ "name": "DuckDuckGo",
+ "description": "Search DuckDuckGo",
+ "manifest_version": 2,
+- "version": "1.3",
++ "version": "1.2",
+ "browser_specific_settings": {
+ "gecko": {
+ "id": "ddg@search.mozilla.org"
+@@ -21,7 +21,7 @@
+ "name": "DuckDuckGo",
+ "search_url": "https://duckduckgo.com/",
+ "search_form": "https://duckduckgo.com/?q={searchTerms}",
+- "search_url_get_params": "t=ffab&q={searchTerms}",
++ "search_url_get_params": "q={searchTerms}",
+ "suggest_url": "https://ac.duckduckgo.com/ac/",
+ "suggest_url_get_params": "q={searchTerms}&type=list"
+ }
+diff -Nru firefox-109.0.1+build1-0ubuntu0.22.04.1~mt1+11.0trisquel94/browser/components/search/extensions/ddg-html/manifest.json firefox-109.0+build2/browser/components/search/extensions/ddg-html/manifest.json
+--- firefox-109.0.1+build1-0ubuntu0.22.04.1~mt1+11.0trisquel94/browser/components/search/extensions/ddg-html/manifest.json 2023-01-29 00:04:37.509029685 -0600
++++ firefox-109.0+build2/browser/components/search/extensions/ddg-html/manifest.json 2023-01-14 12:40:57.000000000 -0600
+@@ -2,7 +2,7 @@
+ "name": "DuckDuckGo (HTML)",
+ "description": "Search DuckDuckGo (HTML)",
+ "manifest_version": 2,
+- "version": "1.3",
++ "version": "1.2",
+ "browser_specific_settings": {
+ "gecko": {
+ "id": "ddg-html@search.mozilla.org"
+@@ -21,7 +21,7 @@
+ "name": "DuckDuckGo (HTML)",
+ "search_url": "https://html.duckduckgo.com/html/",
+ "search_form": "https://html.duckduckgo.com/html/?q={searchTerms}",
+- "search_url_get_params": "t=ffab&q={searchTerms}",
++ "search_url_get_params": "q={searchTerms}",
+ "suggest_url": "https://ac.duckduckgo.com/ac/",
+ "suggest_url_get_params": "q={searchTerms}&type=list"
+ }
diff --git a/helpers/make-firefox b/helpers/make-firefox
index fc708d12..20424983 100644
--- a/helpers/make-firefox
+++ b/helpers/make-firefox
@@ -2,7 +2,7 @@
#
# Copyright (C) 2008-2022 Ruben Rodriguez <ruben@trisquel.info>
# Copyright (C) 2015 Santiago Rodriguez <santi@trisquel.info>
-# Copyright (C) 2022 Luis Guzman <ark@switnet.org>
+# Copyright (C) 2023 Luis Guzman <ark@switnet.org>
#
# 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
@@ -19,7 +19,7 @@
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#
-VERSION=94
+VERSION=95
EXTERNAL='deb-src http://ppa.launchpadcontent.net/mozillateam/ppa/ubuntu $UPSTREAM main'
REPOKEY=9BDB3D89CE49EC21
@@ -238,11 +238,11 @@ cp $DATA/newtab/*.ico browser/components/newtab/data/content/tippytop/favicons/
cp $DATA/newtab/*.png browser/components/newtab/data/content/tippytop/images/
# Custom DDG
-sed '/"params"/,/],/d' -i browser/components/search/extensions/ddg/manifest.json
cp browser/components/search/extensions/ddg browser/components/search/extensions/ddg-html -a
sed 's|/duckduckgo.com/|/html.duckduckgo.com/html/|' -i browser/components/search/extensions/ddg-html/manifest.json
sed 's|DuckDuckGo|DuckDuckGo (HTML)|' -i browser/components/search/extensions/ddg-html/manifest.json
sed 's|ddg@|ddg-html@|' -i browser/components/search/extensions/ddg-html/manifest.json
+patch --no-backup-if-mismatch -p1 < $DATA/rollback_ddg_firefox_partnership_codes.patch
# disable ads, disable redirect
#sed '/search/s|q=|k1=-1\&kd=-1\&ko=1\&q=|' -i browser/components/search/extensions/ddg/manifest.json
--
GitLab