diff options
author | Mark H Weaver <mhw@netris.org> | 2019-10-21 04:55:12 -0400 |
---|---|---|
committer | Mark H Weaver <mhw@netris.org> | 2019-10-26 18:21:03 -0400 |
commit | ad21d767df29f6808b4291a10c0b32bd34b6b5d4 (patch) | |
tree | 850a0f7187dc816399472cb83f1c00a7008b2203 | |
parent | 88f95687c79d33442bcc04062b17bfe946d7d109 (diff) | |
download | patches-ad21d767df29f6808b4291a10c0b32bd34b6b5d4.tar patches-ad21d767df29f6808b4291a10c0b32bd34b6b5d4.tar.gz |
gnu: icecat: Update to 68.2.0-guix0-preview1 [security fixes].
Fixes CVE-2019-11757, CVE-2019-11759, CVE-2019-11760, CVE-2019-11761,
CVE-2019-11762, CVE-2019-11763, CVE-2019-11764, and CVE-2019-15903.
Note: IceCat 68 has not yet been released by the IceCat project. This is a
work-in-progress, and does not currently meet the privacy-respecting
standards of the IceCat project.
* gnu/packages/patches/icecat-default-search-ddg.patch,
gnu/packages/patches/icecat-disable-sync.patch: New files.
* gnu/local.mk (dist_patch_DATA): Add them.
* gnu/packages/gnuzilla.scm (%icecat-version): Update.
(mozilla-compare-locales, all-mozilla-locales): New variables.
(mozilla-locale): New procedure.
(mozilla-locales): New macro.
(icecat-source): Add code to populate the l10n directory. Remove the code
that copied the l10n directory from an older IceCat source tarball.
(icecat)[inputs]: Remove hunspell.
[native-inputs]: Comment out previous Guix-specific patches for now. Use the
newest rust, cargo, llvm, and clang. Add rust-cbindgen, node, nasm, python 3,
icecat-default-search-ddg.patch and icecat-disable-sync.patch.
[arguments]: In configure flags: remove "--disable-maintenance-service" and
"--enable-system-hunspell", and comment out flags to use system libraries
instead of bundled libraries for libevent, libogg, libvorbis, libvpx,
harfbuzz, graphite2, and sqlite. Add srfi-34 and srfi-35 to modules. Delete
fewer bundled libraries. Adapt the 'patch-source-shebangs' phase. Add a
custom 'build' phase that tries the standard 'build' phase up to 5 times.
In the 'wrap-program' phase, set MOZ_LEGACY_PROFILES=1 in the environment,
and add 'pulseaudio' to the front of LD_LIBRARY_PATH.
[description]: Add a warning that this is only a preview release.
* gnu/packages/patches/icecat-makeicecat.patch: Adapt.
-rw-r--r-- | gnu/local.mk | 2 | ||||
-rw-r--r-- | gnu/packages/gnuzilla.scm | 303 | ||||
-rw-r--r-- | gnu/packages/patches/icecat-default-search-ddg.patch | 1108 | ||||
-rw-r--r-- | gnu/packages/patches/icecat-disable-sync.patch | 9 | ||||
-rw-r--r-- | gnu/packages/patches/icecat-makeicecat.patch | 33 |
5 files changed, 1373 insertions, 82 deletions
diff --git a/gnu/local.mk b/gnu/local.mk index 50bcab514a..8befd568d6 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -977,6 +977,8 @@ dist_patch_DATA = \ %D%/packages/patches/hplip-remove-imageprocessor.patch \ %D%/packages/patches/hydra-disable-darcs-test.patch \ %D%/packages/patches/icecat-makeicecat.patch \ + %D%/packages/patches/icecat-default-search-ddg.patch \ + %D%/packages/patches/icecat-disable-sync.patch \ %D%/packages/patches/icecat-avoid-bundled-libraries.patch \ %D%/packages/patches/icecat-use-system-graphite2+harfbuzz.patch \ %D%/packages/patches/icecat-use-system-media-libs.patch \ diff --git a/gnu/packages/gnuzilla.scm b/gnu/packages/gnuzilla.scm index 9ee9ca2f03..db7106c4da 100644 --- a/gnu/packages/gnuzilla.scm +++ b/gnu/packages/gnuzilla.scm @@ -34,6 +34,7 @@ #:use-module (guix packages) #:use-module (guix download) #:use-module (guix git-download) + #:use-module (guix hg-download) #:use-module (guix gexp) #:use-module (guix store) #:use-module (guix monads) @@ -64,10 +65,12 @@ #:use-module (gnu packages pulseaudio) #:use-module (gnu packages python) #:use-module (gnu packages python-xyz) + #:use-module (gnu packages node) #:use-module (gnu packages xorg) #:use-module (gnu packages gl) #:use-module (gnu packages assembly) #:use-module (gnu packages rust) + #:use-module (gnu packages rust-cbindgen) #:use-module (gnu packages llvm) #:use-module (gnu packages nss) #:use-module (gnu packages icu4c) @@ -404,6 +407,127 @@ in C/C++.") ("pkg-config" ,pkg-config) ("python" ,python-2))))) +(define mozilla-compare-locales + (origin + (method hg-fetch) + (uri (hg-reference + (url "https://hg.mozilla.org/l10n/compare-locales/") + (changeset "RELEASE_3_3_0"))) + (file-name "mozilla-compare-locales") + (sha256 (base32 "0biazbq7vbi99b99rfn4szwyx032dkpi09c9z4zs6f1br0f86iy1")))) + +(define (mozilla-locale locale changeset hash-string) + (origin + (method hg-fetch) + (uri (hg-reference + (url (string-append "https://hg.mozilla.org/l10n-central/" + locale)) + (changeset changeset))) + (file-name (string-append "mozilla-locale-" locale)) + (sha256 (base32 hash-string)))) + +(define-syntax-rule (mozilla-locales (hash-string changeset locale) ...) + (list (mozilla-locale locale changeset hash-string) + ...)) + +(define all-mozilla-locales + (mozilla-locales + ;; sha256 changeset locale + ;;--------------------------------------------------------------------------- + ("0pybx6j2ycbrr1xmv0spv19sd8a1dyzcs8kf6pzn71w8y6kiagcf" "35959cf2343c" "ach") + ("0dixmkha738w7fkx20nx95xkfyrqb9vczpy6m03qnqfvb76xaxj5" "e8dc1010f909" "af") + ("124j09va25gwfxdzyfixrli0skxv53c7niagjyp7g3a3kcv2lbhc" "4c67f6b96a7b" "an") + ("0flgqll3xx0ym0zj0w9j2jw3fmhs6h9m4l5da6m0bpnk5ff80r06" "34cbea5f44a5" "ar") + ("0kdb1yqfbfz508f4p77z3p1v6fwy190vs5ipj58hgdixjgbxkqay" "b4790b27633c" "ast") + ("1vm5xw6wg12pygswd3p0qpkaxyryah6nif5n15chb4sb42c1gqcm" "96d341bf49d4" "az") + ("1j2qrrws51qij6haz5b77n5vzqhsxgs1ppqqw4mdrkacwvz4ciwh" "4adaede00646" "be") + ("0ydr8f9lbd51prgcbjb5yacb461j8va0s5bqfs0rnglkvhmk6ard" "d1140972aefe" "bg") + ("0wyw90zjp8kpd1gljng00in9wr2cf59ww6z002lgx5k4gibnqcfd" "2b3ce92c2310" "bn") + ("0kkq621h1qdmimyrmms9g5p70m54z2ddw4cd962nqbkrnmabq9vn" "426896350893" "br") + ("0vibhnb3cbpbgf10db04g6vm372kb9i27p0jkwif019f7qprswd8" "7463f339ce07" "bs") + ("1l8cn2fqfvx7bswzfy9vavv8cd32ha9ygdxxdbxi64wcgw0f80bf" "dab3f05125e4" "ca") + ("0fik17y8zyg9w82lq501ic73a53c0q9r8v4zgn9bnzgsygig8qpq" "ebb9d989275a" "cak") + ("0sj29v6144h39wzb4rvxph3cwgvs4gzkgpr0463d3fcs6jdi0kjs" "522352780348" "cs") + ("1nz8jlx62l69jcdi59hlk8jysm15sh3d1cxqginjmx7w351wsidm" "0791b954c333" "cy") + ("1vc01q1vlq26xm1vm1x0119jawxxp975p9k8ashmiwncl1bvqb48" "121f5f876f4c" "da") + ("1iqny61rg57banfbbskc2y3pr6d35fabnxmynv7vxm9jd86pndz3" "95fb3e99a2bc" "de") + ("06v9j8acx5h8za7m65v6qm0wjbkx6vm46m8sigcp69phyg3fjc96" "90e681b74587" "dsb") + ("0lbk90x2dxdbh63fycqxspx6jqq2zlzys6grg45balw8yyvzqrkz" "58ba4c13fd42" "el") + ("0c2ypvy0z8g78s5158v6h9khckq1xps34r5wbiiciix289m43dgl" "8953d8c98a30" "en-CA") + ("0z3riz3w2z6p710p90ridmwwam4snnz5mn90gd4jc1h2n7vc9mr0" "5a2b9bca3f52" "en-GB") + ("102gn3h4ap8c3x1p7vfc88vapkfiz6264y6byhxy1axxjk3x3a77" "e87cb1c61d6e" "eo") + ("148wj6wsx0aq7cpaxk8njj7cb1wfjr2m96dgxq6b3qcv781ldvjn" "5db15fdf95d5" "es-AR") + ("0r11d8vzvbyz17n371byvkrnszcv1zhr7rg64i58xra3y6d7is7n" "ce2ee0e51a92" "es-CL") + ("1xmqa8p7lpqvkgg879hfnmf6kxcpawjk8z31cdzfp1hrdlmxg8n7" "7346617620f3" "es-ES") + ("0jxv3jh2018lnybr9mzqrffvwmr87yab9bh8lxqjj294fxw1hrxm" "687f05eb0c58" "es-MX") + ("1rpgv7pajv4xldsn1xxsia5j72vn3x8zl5wmbzkyw56lvn9fckvf" "839a5029c496" "et") + ("0hxp4fr3y05rkpamdb1hlmybn6d3bv3rcawjm3axbpqxbyfdpfzc" "54e8d87230c9" "eu") + ("1y50knymnmcihw8bhvahicc386mjm6dx4hx0j6fv8sl23wzx2h9m" "c5ffca960f9c" "fa") + ("0pj9zgi0c3yl3myhvb5afiijayp2lqzhlk630ahxn5hgjgkz0lx7" "75c000a8538d" "ff") + ("199jg0zv7wp1cq0ik2hf84j99jx5vq2jwac0gaayvjzkh2z83jqr" "f11b2e689e7b" "fi") + ("1vxkiwwni7470ywy99arxxa56ljkhjrhxslsp1l1l61g6gdbbspr" "49ec4f791806" "fr") + ("0d8gwdcj0jpjv03nhjds8jrg86pg371xpylaibwri76wlyl7m54i" "faa761a5cfdc" "fy-NL") + ("0nipbxx11a2sjadzhbi88vgknw5hzr4nqy2722q3kc1212jbi754" "5bd9466f9f9d" "ga-IE") + ("0bay8mrm65cvmnvqpwqgzr0h3cb18ifzg5kbsbxcvdfm9xv0zi9g" "a4f6a47e82dd" "gd") + ("00kn5w3nnpw1pxg6hhrn9asf9hgpjd6ia4038iwzcqs68w887qcy" "6c2aa01ada4e" "gl") + ("0jj13i0ach85c975vaz2rr83mibs29ipssa7qsjkb0y2ch6xya1k" "c2d607e36cb5" "gn") + ("1nhqbgzilcb0pr7941dxkhg079bf8v7ldikp1s5xli34wf9sabm2" "f34465d6ac1c" "gu-IN") + ("11bh0541d996cfin1zy72l66753q94i4idgv2waf0h40h9g3z1bm" "c2ecb2762274" "he") + ("1lslji7hh5lx5ig1xgfjh4cdindsgh3n2a7qlvzwz96gda43lvv4" "94d2bb10ee03" "hi-IN") + ("1nx5yw00l25i3m3grdm29mi9mi7h0cy5qx02pypir754pk3hiwcc" "08df0d94edd5" "hr") + ("19yc9dk2pwqycynmx58d1ik6x4mnyfxscgr6sg676dpl613xd7nq" "21b614e77025" "hsb") + ("0l3z64jlx6b6ivk1b5hwqyx9hm1m5721ywnb2m4zmg3g9fw4vn7f" "f82cad7170af" "hu") + ("1sn0dxbbf2zwcpybwcw77qb4p0hf6fxapnsnn4avaab5g55dlgz4" "d94c30920396" "hy-AM") + ("0c92cqxrhv4317kirmhpjk7mrq44yn6fp3v6syxnhz7xwxnhshjm" "6a5f176b0626" "ia") + ("03gyg9gqsd6pwb9nydglhm46fi2wk2p2qygmhmrf8hnav3ba7n0r" "94e4302e0f85" "id") + ("0ky8aaps92mn56rvkwn0i13wg8av8hzi1fvr0ahqhjcpj5sfgdwq" "eca348a59888" "is") + ("01py0sfg7nljcsgpivryrvai4p4wzbcvhgc2ymr19r579nv1vw7g" "d541a6197359" "it") + ("0iv7vmj43njmi7g1gjzsv68ax4j502d2wnkvbfz1rx11lrqs7yw1" "a5ab3a1d95b7" "ja") + ("1sr9ccshcw6agbj4hbnpblxixb1jz0m36glas6f9ahxmi7m605si" "63763ffa5a94" "ja-JP-mac") + ("1as33pzcsdkynrj16dv7w642vl6plbhk650am4l5djwm64f2rgms" "aa83e8555ddc" "ka") + ("1jwaqb5qps3i5y9iw8l2hrwa0n8lfnx1k9x0p54y3jkh6p3q3fzc" "0e0e25c26247" "kab") + ("0cjfiwv0q5i8d7fpwb4m2w5ahq687dqjlwlicgpa443yi2zsxr4s" "33117723ceb1" "kk") + ("0k5b56cv39aaxf9r0p9c27f3fp6yq2ffd4w6qmd0ibpl69sm629d" "aff7b2a7825e" "km") + ("1a0zg96jgq4zn9cz0h2qwc0vv1fbkfzs5qrgabg62wqgz286jvvv" "ea91638cb1dd" "kn") + ("0jhmv2n3yx55r6fg3myg7j1c1nhsv25g016m6lh2j023xbr723gp" "88821009b5b3" "ko") + ("06bybgv4m4i7r9p0qld65j31vbrnljhsdj649dl93msv2r69ilif" "88685d5f07b3" "lij") + ("1bzjf8smw6ngi88j5g3fawrg54m8fifbhshwjbgkpj7rnrpjgh4w" "e046c7ffa7d0" "lt") + ("18dmzmpavijb7fwzffas0j5nb6byqp8h6ki7hhf6qb35diqgfq6n" "c520ef4f576c" "lv") + ("055zf7xj5h1h8mzxj1cjzhngpcvg2p5vs2dmffsa5zfprj02d0dm" "9e43723f18ad" "mk") + ("1496fbyyzcl075gzcd3xy50h9jyhnzgb544k1scji56yhyfajacb" "ce615fef92c1" "mr") + ("1wc1q8ksry181pvnysqsq4dhhsg5adw5vgqafmmq5sf6i2bwn2z0" "4fefe88cfaee" "ms") + ("0awf6mrdwdhy2yvxynssvp1zg1nc2fqbmg2d2bhjcib69zx944xw" "3987a06866fd" "my") + ("1hycvz7i4jd40hfs5abx6sgfdkafg0jhdgqih9b7lb08aqcl35pj" "2b3b8997d9a1" "nb-NO") + ("048z1ib46izwryyy8l1x71kq4775n7l2ilbskhsyrbxqryma13k8" "f25324281615" "ne-NP") + ("1qkxqpyr4la9bn1bqsgc2h9869arglh9n2kwpkq6722jzdbynkz2" "04c7d32c57f6" "nl") + ("08gnmdll55dbqj7qs63gq1kljbvg24nzns6q4m0av3sszsic0jv5" "5587520e5019" "nn-NO") + ("1yh2p4ipj5p2b7gh0xxj0n7ndvwn5bw2773ibrh7vz932mkzhhjn" "499386b02695" "oc") + ("0kjbnixjzv9hvyba4ll20gs76vx84pviy134fvpjp9lfjpnpib55" "31c01c325675" "pa-IN") + ("0g61imvr4639bbydyi0kwc1il7l1gzlfij4ywx7hdcmq2x6vgb9v" "fb5f3b8dea09" "pl") + ("13n68d7z94d7943m6fwl4kizbqm3wp82xz69vng4w9vyqlvv7d41" "9a541cbdc748" "pt-BR") + ("1j8afvrl1afmj2zixrp91rrhag5w4xw90raca1ic6mxyih9kvdi4" "edc959a685c2" "pt-PT") + ("0wf4a6q9nvcmam2g8ksbymjdnrz59pdr5nirfpjprfhifjmxx4nn" "d2699db715cd" "rm") + ("1k9qalir5pbh490w1mxyq31yhy9hbxsyrrk11hwlwlgn6syp9nvp" "b5460a9017bc" "ro") + ("1avy6wyfa5lbvy36wai6mwhhh6x1y8a0jyjk8hvjn52yfxj1gypk" "59ffa8ad047a" "ru") + ("1cakhm4jxcw1ij0l1vhxw74hsp5wg68i3319dkdncyyc5a2s1qv9" "8b3c8a7ebdfa" "si") + ("0s534r09bqdfvw3q17y9b1035kzzlafjv656v73mqhyz3fkffsx5" "cb39dc77980e" "sk") + ("1s58vgmnb9aiaiaqwwcivq3iyzpzj527w2aqh2nrh6xmaw7f43sr" "17d7969b1d9a" "sl") + ("147qm7x5z8rkf24jpqvkdlqg0fjz1l3zwnaxvkh9y2jpzv7m0x7z" "c55b0e9ff99d" "son") + ("0nn4r1rxi8cy7x9nmn5ljd8gcsn2rjl2ma2j7waxkafkm4rs6n20" "2bb3808072da" "sq") + ("0jsb01b94z7qbm59yaj56nb7yx7a6hpgw8v6nzwhbvmnmcsird4p" "c323c0d02d61" "sr") + ("1n7vv9y4sk3gig56rgfd2jk8jr2160grxk31bd1wkm7fvbndd259" "4220ce487cbc" "sv-SE") + ("06270mq7gajxfrsb8gqd25v2dac68ask5vvlh6kkkp3hrgy02vid" "6a1dbc2fe1d3" "ta") + ("10az7pd3npa7n8wq0qywvsj2qrx9592i2wffs3rnc1fviv1i1q0y" "028505b5ecd1" "te") + ("0yj0c3iyibb3jyypvyiyhbr9asxa48v0nq21kcf9gphi8fnyp5if" "e44d38b6a67b" "th") + ("1qc4nvhw834lx7p304fxma0fjdr4xfj4lf69dhh6biqz795lx45p" "1e0771d95708" "tr") + ("1g4y2yq5xp61ncy7c08j7fqqr1jc0m1hjxmbg5659wzif3b3dkg4" "e3c96943e98f" "uk") + ("1zbi28z1c3p5il7ndixyjsv4nrimzq36zjvlmq10am38ycqr9df8" "f35da1b02691" "ur") + ("1jrxjjj8k771y0wljqbadxdj4pasg0771jmg4l3hvpgs929i3j9g" "6fd2084b3efe" "uz") + ("1f8sqgxzgqmw6vzjv3f49lg43q09i3j62f471864vr71815agl8n" "33b5dfd0cd63" "vi") + ("0ssnsbxw3q5k88fa081gkn1mbqn4j7bm6vb7yvz6h44j214xkz9x" "2d87c0740715" "xh") + ("0kd3mrvvgczhsmw4rvpxxxc71bb469ayr8r4azf7gc0y5nmlm950" "a2b6625688d3" "zh-CN") + ("0qy1asyfplkyc89z3g3gfm7b32aka92350b3ayv9d9dcgwxmfdwz" "4d6e959a13d1" "zh-TW"))) + (define (mozilla-patch file-name changeset hash) "Return an origin for CHANGESET from the mozilla-esr60 repository." (origin @@ -426,7 +550,7 @@ from forcing GEXP-PROMISE." #:system system #:guile-for-build guile))) -(define %icecat-version "60.9.0-guix1") +(define %icecat-version "68.2.0-guix0-preview1") ;; 'icecat-source' is a "computed" origin that generates an IceCat tarball ;; from the corresponding upstream Firefox ESR tarball, using the 'makeicecat' @@ -448,24 +572,11 @@ from forcing GEXP-PROMISE." "firefox-" upstream-firefox-version ".source.tar.xz")) (sha256 (base32 - "0gy5x2rnnbkqmjd9sq93s3q5na9nkba68xwpizild7k6qn63qicz")))) - - (upstream-icecat-base-version "60.7.0") ; maybe older than base-version - (upstream-icecat-gnu-version "1") - (upstream-icecat-version (string-append upstream-icecat-base-version - "-gnu" - upstream-icecat-gnu-version)) - (upstream-icecat-source - (origin - (method url-fetch) - (uri (string-append - "mirror://gnu/gnuzilla/" upstream-icecat-base-version - "/icecat-" upstream-icecat-version ".tar.bz2")) - (sha256 - (base32 - "09xqdfd8rwbn2n6m7n059qf1psbrj5v5kfzm7gg5xng22ddxawv8")))) + "0f3gf5gwhxabm6xs29nlxmfqdw3fs7v458vq1fydrglfyvmc5wc5")))) - (gnuzilla-commit (string-append "v" upstream-icecat-base-version)) + (upstream-icecat-base-version "68.1.0") ; maybe older than base-version + ;;(gnuzilla-commit (string-append "v" upstream-icecat-base-version)) + (gnuzilla-commit "395cc0798600cde44a30abaa3f5d08ce8b68f782") (gnuzilla-source (origin (method git-fetch) @@ -475,7 +586,7 @@ from forcing GEXP-PROMISE." (file-name (git-file-name "gnuzilla" upstream-icecat-base-version)) (sha256 (base32 - "1vqhb0py28hnwcynbaad304ziciz1kn5bv1qg2q4f7g13js3b1hf")))) + "1ll3j2kpsfp1f9dxy67fay1cidsng02l8a3a23wdjqkxgrg1cf4g")))) (makeicecat-patch (local-file (search-patch "icecat-makeicecat.patch")))) @@ -492,9 +603,7 @@ from forcing GEXP-PROMISE." (let ((firefox-dir (string-append "firefox-" #$base-version)) (icecat-dir - (string-append "icecat-" #$%icecat-version)) - (old-icecat-dir - (string-append "icecat-" #$upstream-icecat-base-version))) + (string-append "icecat-" #$%icecat-version))) (mkdir "/tmp/bin") (set-path-environment-variable @@ -540,9 +649,6 @@ from forcing GEXP-PROMISE." (string-append "FFMINOR=" #$minor-version "\n")) (("^FFSUB=.*") (string-append "FFSUB=" #$sub-version "\n")) - (("^GNUVERSION=.*") - (string-append "GNUVERSION=" - #$upstream-icecat-gnu-version "\n")) (("^DATA=.*") "DATA=/tmp/gnuzilla/data\n") (("^find extensions/gnu/ ") @@ -556,19 +662,39 @@ from forcing GEXP-PROMISE." (rename-file firefox-dir icecat-dir) (with-directory-excursion icecat-dir + (format #t "Populating l10n directory...~%") + (force-output) (mkdir "l10n") + (with-directory-excursion "l10n" + (for-each + (lambda (locale-dir) + (let ((locale + (string-drop (basename locale-dir) + (+ 32 ; length of hash + (string-length "-mozilla-locale-"))))) + (format #t " ~a~%" locale) + (force-output) + (copy-recursively locale-dir locale + #:log (%make-void-port "w")) + (for-each make-file-writable (find-files locale)) + (with-directory-excursion locale + (when (file-exists? ".hgtags") + (delete-file ".hgtags")) + (mkdir-p "browser/chrome/browser/preferences") + (call-with-output-file + "browser/chrome/browser/preferences/advanced-scripts.dtd" + (lambda (port) #f))))) + '#+all-mozilla-locales) + (copy-recursively #+mozilla-compare-locales + "compare-locales" + #:log (%make-void-port "w")) + (delete-file "compare-locales/.gitignore") + (delete-file "compare-locales/.hgignore") + (delete-file "compare-locales/.hgtags")) + (format #t "Running makeicecat script...~%") (force-output) - (invoke "bash" "/tmp/gnuzilla/makeicecat") - (delete-file-recursively "l10n")) - - (format #t (string-append "Unpacking l10n/* from" - " upstream IceCat tarball...~%")) - (force-output) - (unless (string=? icecat-dir old-icecat-dir) - (symlink icecat-dir old-icecat-dir)) - (invoke "tar" "xf" #+upstream-icecat-source - (string-append old-icecat-dir "/l10n")) + (invoke "bash" "/tmp/gnuzilla/makeicecat")) (format #t "Packing new IceCat tarball...~%") (force-output) @@ -605,7 +731,6 @@ from forcing GEXP-PROMISE." ("pango" ,pango) ("freetype" ,freetype) ("harfbuzz" ,harfbuzz) - ("hunspell" ,hunspell) ("libcanberra" ,libcanberra) ("libgnome" ,libgnome) ("libjpeg-turbo" ,libjpeg-turbo) @@ -640,24 +765,32 @@ from forcing GEXP-PROMISE." ;; and therefore we prefer to leave them out of 'source', which should be ;; a tarball suitable for compilation on any system that IceCat supports. ;; (Bug fixes and security fixes, however, should go in 'source'). - `(("icecat-avoid-bundled-libraries.patch" - ,(search-patch "icecat-avoid-bundled-libraries.patch")) - ("icecat-use-system-graphite2+harfbuzz.patch" - ,(search-patch "icecat-use-system-graphite2+harfbuzz.patch")) - ("icecat-use-system-media-libs.patch" - ,(search-patch "icecat-use-system-media-libs.patch")) + `(;; XXX TODO: Adapt these patches to IceCat 68. + ;; ("icecat-avoid-bundled-libraries.patch" + ;; ,(search-patch "icecat-avoid-bundled-libraries.patch")) + ;; ("icecat-use-system-graphite2+harfbuzz.patch" + ;; ,(search-patch "icecat-use-system-graphite2+harfbuzz.patch")) + ;; ("icecat-use-system-media-libs.patch" + ;; ,(search-patch "icecat-use-system-media-libs.patch")) + ("icecat-default-search-ddg.patch" + ,(search-patch "icecat-default-search-ddg.patch")) + ("icecat-disable-sync.patch" + ,(search-patch "icecat-disable-sync.patch")) ("patch" ,(canonical-package patch)) - ;; Icecat 60 checks for rust>=1.24 - ("rust" ,rust-1.24) - ("cargo" ,rust-1.24 "cargo") - ("llvm" ,llvm-3.9.1) - ("clang" ,clang-3.9.1) + ("rust" ,rust) + ("cargo" ,rust "cargo") + ("rust-cbindgen" ,rust-cbindgen) + ("llvm" ,llvm) + ("clang" ,clang) ("perl" ,perl) - ("python" ,python-2) ; Python 3 not supported + ("node" ,node) + ("python" ,python) + ("python-2" ,python-2) ("python2-pysqlite" ,python2-pysqlite) ("yasm" ,yasm) + ("nasm" ,nasm) ; XXX FIXME: only needed on x86_64 and i686 ("pkg-config" ,pkg-config) ("autoconf" ,autoconf-2.13) ("which" ,which))) @@ -681,7 +814,6 @@ from forcing GEXP-PROMISE." "--disable-tests" "--disable-updater" "--disable-crashreporter" - "--disable-maintenance-service" "--disable-eme" "--disable-gconf" @@ -712,11 +844,11 @@ from forcing GEXP-PROMISE." "--with-system-zlib" "--with-system-bz2" "--with-system-jpeg" ; must be libjpeg-turbo - "--with-system-libevent" - "--with-system-ogg" - "--with-system-vorbis" - ;; "--with-system-theora" ; wants theora-1.2, not yet released - "--with-system-libvpx" + ;; UNBUNDLE-ME! "--with-system-libevent" + ;; UNBUNDLE-ME! "--with-system-ogg" + ;; UNBUNDLE-ME! "--with-system-vorbis" + ;; UNBUNDLE-ME! "--with-system-theora" ; wants theora-1.2, not yet released + ;; UNBUNDLE-ME! "--with-system-libvpx" "--with-system-icu" ;; See <https://bugs.gnu.org/32833> @@ -725,12 +857,11 @@ from forcing GEXP-PROMISE." ;; UNBUNDLE-ME! "--with-system-nspr" ;; UNBUNDLE-ME! "--with-system-nss" - "--with-system-harfbuzz" - "--with-system-graphite2" + ;; UNBUNDLE-ME! "--with-system-harfbuzz" + ;; UNBUNDLE-ME! "--with-system-graphite2" "--enable-system-pixman" "--enable-system-ffi" - "--enable-system-hunspell" - "--enable-system-sqlite" + ;; UNBUNDLE-ME! "--enable-system-sqlite" ;; Fails with "--with-system-png won't work because ;; the system's libpng doesn't have APNG support". @@ -748,6 +879,8 @@ from forcing GEXP-PROMISE." #:modules ((ice-9 ftw) (ice-9 rdelim) (ice-9 match) + (srfi srfi-34) + (srfi srfi-35) ,@%gnu-build-system-modules) #:phases (modify-phases %standard-phases @@ -802,18 +935,18 @@ from forcing GEXP-PROMISE." ;; "modules/freetype2" "modules/zlib" - "modules/libbz2" - "ipc/chromium/src/third_party/libevent" - "media/libjpeg" - "media/libvpx" - "media/libogg" - "media/libvorbis" - ;; "media/libtheora" ; wants theora-1.2, not yet released - "media/libtremor" - "gfx/harfbuzz" - "gfx/graphite2" + ;; "media/libjpeg" ; needed for now, because media/libjpeg/moz.build is referenced from config/external/moz.build + ;; UNBUNDLE-ME! "ipc/chromium/src/third_party/libevent" + ;; UNBUNDLE-ME! "media/libvpx" + ;; UNBUNDLE-ME! "media/libogg" + ;; UNBUNDLE-ME! "media/libvorbis" + ;; UNBUNDLE-ME! "media/libtheora" ; wants theora-1.2, not yet released + ;; UNBUNDLE-ME! "media/libtremor" + ;; UNBUNDLE-ME! "gfx/harfbuzz" + ;; UNBUNDLE-ME! "gfx/graphite2" "js/src/ctypes/libffi" - "db/sqlite3")) + ;; UNBUNDLE-ME! "db/sqlite3" + )) #t)) (add-after 'remove-bundled-libraries 'link-libxul-with-libraries (lambda _ @@ -840,7 +973,7 @@ from forcing GEXP-PROMISE." (lambda _ (use-modules (guix build cargo-utils)) (let ((null-hash "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855")) - (substitute* '("Cargo.lock" "servo/Cargo.lock") + (substitute* '("Cargo.lock" "gfx/wr/Cargo.lock") (("(\"checksum .* = )\".*\"" all name) (string-append name "\"" null-hash "\""))) (for-each @@ -890,6 +1023,22 @@ from forcing GEXP-PROMISE." (apply invoke bash (string-append srcdir "/configure") flags)))) + (replace 'build + ;; The build system often spuriously fails. See + ;; <https://bugs.gentoo.org/show_bug.cgi?id=680934>. To + ;; work around this, we try the standard 'build' phase up + ;; to 5 times. + (lambda args + (let ((build (assoc-ref %standard-phases 'build))) + (let retry ((remaining-attempts 5)) + (if (= remaining-attempts 1) + (apply build args) + (guard (c ((invoke-error? c) + (format #t "~%Retrying build! (~a attempts remaining)~%~%" + (- remaining-attempts 1)) + (force-output) + (retry (- remaining-attempts 1)))) + (apply build args))))))) (add-before 'configure 'install-desktop-entry (lambda* (#:key outputs #:allow-other-keys) ;; Install the '.desktop' file. @@ -925,16 +1074,24 @@ from forcing GEXP-PROMISE." (let* ((out (assoc-ref outputs "out")) (lib (string-append out "/lib")) (gtk (assoc-ref inputs "gtk+")) - (gtk-share (string-append gtk "/share"))) + (gtk-share (string-append gtk "/share")) + (pulseaudio (assoc-ref inputs "pulseaudio")) + (pulseaudio-lib (string-append pulseaudio "/lib"))) (wrap-program (car (find-files lib "^icecat$")) - `("XDG_DATA_DIRS" ":" prefix (,gtk-share))) + `("XDG_DATA_DIRS" prefix (,gtk-share)) + `("LD_LIBRARY_PATH" prefix (,pulseaudio-lib)) + `("MOZ_LEGACY_PROFILES" = ("1"))) #t)))))) (home-page "https://www.gnu.org/software/gnuzilla/") (synopsis "Entirely free browser derived from Mozilla Firefox") (description "IceCat is the GNU version of the Firefox browser. It is entirely free software, which does not recommend non-free plugins and addons. It also -features built-in privacy-protecting features.") +features built-in privacy-protecting features. + +WARNING: IceCat 68 has not yet been released by the upstream IceCat project. +This is a preview release, and does not currently meet the privacy-respecting +standards of the IceCat project.") (license license:mpl2.0) ;and others, see toolkit/content/license.html (properties `((ftp-directory . "/gnu/gnuzilla") diff --git a/gnu/packages/patches/icecat-default-search-ddg.patch b/gnu/packages/patches/icecat-default-search-ddg.patch new file mode 100644 index 0000000000..9eea07bcab --- /dev/null +++ b/gnu/packages/patches/icecat-default-search-ddg.patch @@ -0,0 +1,1108 @@ +--- a/browser/components/search/SearchTelemetry.jsm.orig 1980-01-01 18:59:51.000000000 -0500 ++++ b/browser/components/search/SearchTelemetry.jsm 2019-10-25 06:58:49.564335696 -0400 +@@ -40,6 +40,12 @@ + * page mightbe an advert. + */ + const SEARCH_PROVIDER_INFO = { ++ duckduckgo: { ++ regexp: /^https:\/\/duckduckgo\.com\//, ++ queryParam: "q", ++ codeParam: "t", ++ codePrefixes: ["ff"], ++ }, + google: { + regexp: /^https:\/\/www\.google\.(?:.+)\/search/, + queryParam: "q", +@@ -50,12 +56,6 @@ + /^https:\/\/www\.googleadservices\.com\/(?:pagead\/)?aclk/, + ], + }, +- duckduckgo: { +- regexp: /^https:\/\/duckduckgo\.com\//, +- queryParam: "q", +- codeParam: "t", +- codePrefixes: ["ff"], +- }, + yahoo: { + regexp: /^https:\/\/(?:.*)search\.yahoo\.com\/search/, + queryParam: "p", +--- a/browser/components/search/extensions/list.json.orig 1980-01-01 18:59:51.000000000 -0500 ++++ b/browser/components/search/extensions/list.json 2019-10-25 07:27:58.209006756 -0400 +@@ -1,9 +1,9 @@ + { + "default": { +- "searchDefault": "Google", +- "searchOrder": ["Google", "Bing"], ++ "searchDefault": "DuckDuckGo", ++ "searchOrder": ["DuckDuckGo", "Google", "Bing"], + "visibleDefaultEngines": [ +- "google-b-d", "amazondotcom", "bing", "ddg", "ebay", "twitter", "wikipedia" ++ "ddg", "google-b-d", "amazondotcom", "bing", "ebay", "twitter", "wikipedia" + ] + }, + "regionOverrides": { +@@ -54,32 +54,32 @@ + "en-US": { + "default": { + "visibleDefaultEngines": [ +- "google-b-d", "amazondotcom", "bing", "ddg", "ebay", "twitter", "wikipedia" ++ "ddg", "google-b-d", "amazondotcom", "bing", "ebay", "twitter", "wikipedia" + ] + }, + "KZ": { + "visibleDefaultEngines": [ +- "amazondotcom", "bing", "google", "twitter", "wikipedia", "ddg", "yandex-en" ++ "ddg", "amazondotcom", "bing", "google", "twitter", "wikipedia", "yandex-en" + ], +- "searchDefault": "Yandex" ++ "searchDefault": "DuckDuckGo" + }, + "BY": { + "visibleDefaultEngines": [ +- "amazondotcom", "bing", "google", "twitter", "wikipedia", "ddg", "yandex-en" ++ "ddg", "amazondotcom", "bing", "google", "twitter", "wikipedia", "yandex-en" + ], +- "searchDefault": "Yandex" ++ "searchDefault": "DuckDuckGo" + }, + "RU": { + "visibleDefaultEngines": [ +- "amazondotcom", "bing", "google", "twitter", "wikipedia", "ddg", "yandex-en" ++ "ddg", "amazondotcom", "bing", "google", "twitter", "wikipedia", "yandex-en" + ], +- "searchDefault": "Yandex" ++ "searchDefault": "DuckDuckGo" + }, + "TR": { + "visibleDefaultEngines": [ +- "amazondotcom", "bing", "google", "twitter", "wikipedia", "ddg", "yandex-en" ++ "ddg", "amazondotcom", "bing", "google", "twitter", "wikipedia", "yandex-en" + ], +- "searchDefault": "Yandex" ++ "searchDefault": "DuckDuckGo" + }, + "experimental-hidden": { + "visibleDefaultEngines": [ +@@ -90,131 +90,131 @@ + "ach": { + "default": { + "visibleDefaultEngines": [ +- "google-b-d", "bing", "amazondotcom", "ddg", "twitter", "wikipedia" ++ "ddg", "google-b-d", "bing", "amazondotcom", "twitter", "wikipedia" + ] + } + }, + "af": { + "default": { + "visibleDefaultEngines": [ +- "google-b-d", "bing", "amazondotcom", "ddg", "wikipedia-af" ++ "ddg", "google-b-d", "bing", "amazondotcom", "wikipedia-af" + ] + } + }, + "an": { + "default": { + "visibleDefaultEngines": [ +- "google-b-d", "bing", "ebay-es", "wikipedia-an", "ddg", "twitter" ++ "ddg", "google-b-d", "bing", "ebay-es", "wikipedia-an", "twitter" + ] + } + }, + "ar": { + "default": { + "visibleDefaultEngines": [ +- "google-b-d", "bing", "amazondotcom", "ddg", "wikipedia-ar" ++ "ddg", "google-b-d", "bing", "amazondotcom", "wikipedia-ar" + ] + } + }, + "as": { + "default": { + "visibleDefaultEngines": [ +- "google-b-d", "amazon-in", "ddg", "wikipedia-as" ++ "ddg", "google-b-d", "amazon-in", "wikipedia-as" + ] + } + }, + "ast": { + "default": { + "visibleDefaultEngines": [ +- "google-b-d", "bing", "ddg", "ebay-es", "wikipedia-ast" ++ "ddg", "google-b-d", "bing", "ebay-es", "wikipedia-ast" + ] + } + }, + "az": { + "default": { + "visibleDefaultEngines": [ +- "google-b-d", "amazondotcom", "azerdict", "bing", "ddg", "wikipedia-az", "yandex-az" ++ "ddg", "google-b-d", "amazondotcom", "azerdict", "bing", "wikipedia-az", "yandex-az" + ] + } + }, + "be": { + "default": { + "visibleDefaultEngines": [ +- "yandex-by", "google-b-d", "ddg", "wikipedia-be", "wikipedia-be-tarask" ++ "ddg", "yandex-by", "google-b-d", "wikipedia-be", "wikipedia-be-tarask" + ] + }, + "BY": { +- "searchDefault": "Яндекс" ++ "searchDefault": "DuckDuckGo" + }, + "KZ": { +- "searchDefault": "Яндекс" ++ "searchDefault": "DuckDuckGo" + }, + "RU": { +- "searchDefault": "Яндекс" ++ "searchDefault": "DuckDuckGo" + }, + "TR": { +- "searchDefault": "Яндекс" ++ "searchDefault": "DuckDuckGo" + } + }, + "bg": { + "default": { + "visibleDefaultEngines": [ +- "google-b-d", "amazondotcom", "ddg", "pazaruvaj", "wikipedia-bg" ++ "ddg", "google-b-d", "amazondotcom", "pazaruvaj", "wikipedia-bg" + ] + } + }, + "bn": { + "default": { + "visibleDefaultEngines": [ +- "google-b-d", "amazon-in", "bing", "ddg", "wikipedia-bn" ++ "ddg", "google-b-d", "amazon-in", "bing", "wikipedia-bn" + ] + } + }, + "bn-BD": { + "default": { + "visibleDefaultEngines": [ +- "google-b-d", "bing", "ddg", "wikipedia-bn" ++ "ddg", "google-b-d", "bing", "wikipedia-bn" + ] + } + }, + "bn-IN": { + "default": { + "visibleDefaultEngines": [ +- "google-b-d", "amazon-in", "bing", "ddg", "wikipedia-bn" ++ "ddg", "google-b-d", "amazon-in", "bing", "wikipedia-bn" + ] + } + }, + "br": { + "default": { + "visibleDefaultEngines": [ +- "google-b-d", "amazon-france", "ddg", "ebay-fr", "freelang", "wikipedia-br" ++ "ddg", "google-b-d", "amazon-france", "ebay-fr", "freelang", "wikipedia-br" + ] + } + }, + "bs": { + "default": { + "visibleDefaultEngines": [ +- "google-b-d", "ddg", "olx", "twitter", "wikipedia-bs" ++ "ddg", "google-b-d", "olx", "twitter", "wikipedia-bs" + ] + } + }, + "ca": { + "default": { + "visibleDefaultEngines": [ +- "google-b-d", "bing", "diec2", "ddg", "ebay-es", "twitter", "wikipedia-ca" ++ "ddg", "google-b-d", "bing", "diec2", "ebay-es", "twitter", "wikipedia-ca" + ] + } + }, + "cak": { + "default": { + "visibleDefaultEngines": [ +- "google-b-d", "bing", "amazondotcom", "ddg", "wikipedia-es" ++ "ddg", "google-b-d", "bing", "amazondotcom", "wikipedia-es" + ] + } + }, + "crh": { + "default": { + "visibleDefaultEngines": [ +- "google-b-d", "ddg", "twitter", "wikipedia-crh" ++ "ddg", "google-b-d", "twitter", "wikipedia-crh" + ] + } + }, +@@ -222,74 +222,74 @@ + "default": { + "searchOrder": ["Google", "Seznam"], + "visibleDefaultEngines": [ +- "google-b-d", "seznam-cz", "ddg", "heureka-cz", "mapy-cz", "wikipedia-cz" ++ "ddg", "google-b-d", "seznam-cz", "heureka-cz", "mapy-cz", "wikipedia-cz" + ] + } + }, + "cy": { + "default": { + "visibleDefaultEngines": [ +- "google-b-d", "amazon-en-GB", "ddg", "ebay-uk", "palasprint", "wikipedia-cy" ++ "ddg", "google-b-d", "amazon-en-GB", "ebay-uk", "palasprint", "wikipedia-cy" + ] + } + }, + "da": { + "default": { + "visibleDefaultEngines": [ +- "google-b-d", "bing", "amazon-en-GB", "ddg", "wikipedia-da" ++ "ddg", "google-b-d", "bing", "amazon-en-GB", "wikipedia-da" + ] + } + }, + "de": { + "default": { + "visibleDefaultEngines": [ +- "google-b-d", "amazon-de", "bing", "ddg", "ebay-de", "ecosia", "leo_ende_de", "wikipedia-de" ++ "ddg", "google-b-d", "amazon-de", "bing", "ebay-de", "ecosia", "leo_ende_de", "wikipedia-de" + ] + } + }, + "dsb": { + "default": { + "visibleDefaultEngines": [ +- "google-b-d", "bing", "amazon-de", "ddg", "ebay-de", "leo_ende_de", "wikipedia-dsb" ++ "ddg", "google-b-d", "bing", "amazon-de", "ebay-de", "leo_ende_de", "wikipedia-dsb" + ] + } + }, + "el": { + "default": { + "visibleDefaultEngines": [ +- "google-b-d", "amazon-en-GB", "bing", "ddg", "wikipedia-el" ++ "ddg", "google-b-d", "amazon-en-GB", "bing", "wikipedia-el" + ] + } + }, + "en-CA": { + "default": { + "visibleDefaultEngines": [ +- "google-b-d", "amazon-ca", "bing", "ddg", "ebay-ca", "twitter", "wikipedia" ++ "ddg", "google-b-d", "amazon-ca", "bing", "ebay-ca", "twitter", "wikipedia" + ] + }, + "KZ": { + "visibleDefaultEngines": [ +- "yandex-en", "google-b-d", "amazon-ca", "bing", "ddg", "ebay-ca", "twitter", "wikipedia" ++ "ddg", "yandex-en", "google-b-d", "amazon-ca", "bing", "ebay-ca", "twitter", "wikipedia" + ], +- "searchDefault": "Yandex" ++ "searchDefault": "DuckDuckGo" + }, + "BY": { + "visibleDefaultEngines": [ +- "yandex-en", "google-b-d", "amazon-ca", "bing", "ddg", "ebay-ca", "twitter", "wikipedia" ++ "ddg", "yandex-en", "google-b-d", "amazon-ca", "bing", "ebay-ca", "twitter", "wikipedia" + ], +- "searchDefault": "Yandex" ++ "searchDefault": "DuckDuckGo" + }, + "RU": { + "visibleDefaultEngines": [ +- "yandex-en", "google-b-d", "amazon-ca", "bing", "ddg", "ebay-ca", "twitter", "wikipedia" ++ "ddg", "yandex-en", "google-b-d", "amazon-ca", "bing", "ebay-ca", "twitter", "wikipedia" + ], +- "searchDefault": "Yandex" ++ "searchDefault": "DuckDuckGo" + }, + "TR": { + "visibleDefaultEngines": [ +- "yandex-en", "google-b-d", "amazon-ca", "bing", "ddg", "ebay-ca", "twitter", "wikipedia" ++ "ddg", "yandex-en", "google-b-d", "amazon-ca", "bing", "ebay-ca", "twitter", "wikipedia" + ], +- "searchDefault": "Yandex" ++ "searchDefault": "DuckDuckGo" + }, + "experimental-hidden": { + "visibleDefaultEngines": [ +@@ -300,32 +300,32 @@ + "en-GB": { + "default": { + "visibleDefaultEngines": [ +- "google-b-d", "bing", "amazon-en-GB", "chambers-en-GB", "ddg", "ebay-uk", "twitter", "wikipedia" ++ "ddg", "google-b-d", "bing", "amazon-en-GB", "chambers-en-GB", "ebay-uk", "twitter", "wikipedia" + ] + }, + "KZ": { + "visibleDefaultEngines": [ +- "yandex-en", "google-b-d", "bing", "amazon-en-GB", "chambers-en-GB", "ddg", "ebay-uk", "twitter", "wikipedia" ++ "ddg", "yandex-en", "google-b-d", "bing", "amazon-en-GB", "chambers-en-GB", "ebay-uk", "twitter", "wikipedia" + ], +- "searchDefault": "Yandex" ++ "searchDefault": "DuckDuckGo" + }, + "BY": { + "visibleDefaultEngines": [ +- "yandex-en", "google-b-d", "bing", "amazon-en-GB", "chambers-en-GB", "ddg", "ebay-uk", "twitter", "wikipedia" ++ "ddg", "yandex-en", "google-b-d", "bing", "amazon-en-GB", "chambers-en-GB", "ebay-uk", "twitter", "wikipedia" + ], +- "searchDefault": "Yandex" ++ "searchDefault": "DuckDuckGo" + }, + "RU": { + "visibleDefaultEngines": [ +- "yandex-en", "google-b-d", "bing", "amazon-en-GB", "chambers-en-GB", "ddg", "ebay-uk", "twitter", "wikipedia" ++ "ddg", "yandex-en", "google-b-d", "bing", "amazon-en-GB", "chambers-en-GB", "ebay-uk", "twitter", "wikipedia" + ], +- "searchDefault": "Yandex" ++ "searchDefault": "DuckDuckGo" + }, + "TR": { + "visibleDefaultEngines": [ +- "yandex-en", "google-b-d", "bing", "amazon-en-GB", "chambers-en-GB", "ddg", "ebay-uk", "twitter", "wikipedia" ++ "ddg", "yandex-en", "google-b-d", "bing", "amazon-en-GB", "chambers-en-GB", "ebay-uk", "twitter", "wikipedia" + ], +- "searchDefault": "Yandex" ++ "searchDefault": "DuckDuckGo" + }, + "experimental-hidden": { + "visibleDefaultEngines": [ +@@ -336,66 +336,66 @@ + "en-ZA": { + "default": { + "visibleDefaultEngines": [ +- "google-b-d", "bing", "amazondotcom", "ddg", "twitter", "wikipedia" ++ "ddg", "google-b-d", "bing", "amazondotcom", "twitter", "wikipedia" + ] + }, + "KZ": { + "visibleDefaultEngines": [ +- "yandex-en", "google-b-d", "bing", "amazondotcom", "ddg", "twitter", "wikipedia" ++ "ddg", "yandex-en", "google-b-d", "bing", "amazondotcom", "twitter", "wikipedia" + ], +- "searchDefault": "Yandex" ++ "searchDefault": "DuckDuckGo" + }, + "BY": { + "visibleDefaultEngines": [ +- "yandex-en", "google-b-d", "bing", "amazondotcom", "ddg", "twitter", "wikipedia" ++ "ddg", "yandex-en", "google-b-d", "bing", "amazondotcom", "twitter", "wikipedia" + ], +- "searchDefault": "Yandex" ++ "searchDefault": "DuckDuckGo" + }, + "RU": { + "visibleDefaultEngines": [ +- "yandex-en", "google-b-d", "bing", "amazondotcom", "ddg", "twitter", "wikipedia" ++ "ddg", "yandex-en", "google-b-d", "bing", "amazondotcom", "twitter", "wikipedia" + ], +- "searchDefault": "Yandex" ++ "searchDefault": "DuckDuckGo" + }, + "TR": { + "visibleDefaultEngines": [ +- "yandex-en", "google-b-d", "bing", "amazondotcom", "ddg", "twitter", "wikipedia" ++ "ddg", "yandex-en", "google-b-d", "bing", "amazondotcom", "twitter", "wikipedia" + ], +- "searchDefault": "Yandex" ++ "searchDefault": "DuckDuckGo" + } + }, + "eo": { + "default": { + "visibleDefaultEngines": [ +- "google-b-d", "bing", "amazondotcom", "ddg", "wikipedia-eo" ++ "ddg", "google-b-d", "bing", "amazondotcom", "wikipedia-eo" + ] + } + }, + "es-AR": { + "default": { + "visibleDefaultEngines": [ +- "google-b-d", "amazondotcom", "drae", "ddg", "mercadolibre-ar", "wikipedia-es" ++ "ddg", "google-b-d", "amazondotcom", "drae", "mercadolibre-ar", "wikipedia-es" + ] + } + }, + "es-CL": { + "default": { + "visibleDefaultEngines": [ +- "google-b-d", "bing", "drae", "ddg", "mercadolibre-cl", "wikipedia-es" ++ "ddg", "google-b-d", "bing", "drae", "mercadolibre-cl", "wikipedia-es" + ] + } + }, + "es-ES": { + "default": { + "visibleDefaultEngines": [ +- "google-b-d", "bing", "drae", "ddg", "ebay-es", "twitter", "wikipedia-es" ++ "ddg", "google-b-d", "bing", "drae", "ebay-es", "twitter", "wikipedia-es" + ] + } + }, + "es-MX": { + "default": { + "visibleDefaultEngines": [ +- "google-b-d", "bing", "ddg", "mercadolibre-mx", "wikipedia-es" ++ "ddg", "google-b-d", "bing", "mercadolibre-mx", "wikipedia-es" + ] + }, + "experimental-hidden": { +@@ -407,49 +407,49 @@ + "et": { + "default": { + "visibleDefaultEngines": [ +- "google-b-d", "neti-ee", "ddg", "osta-ee", "wikipedia-et", "eki-ee" ++ "ddg", "google-b-d", "neti-ee", "osta-ee", "wikipedia-et", "eki-ee" + ] + } + }, + "eu": { + "default": { + "visibleDefaultEngines": [ +- "google-b-d", "bing", "amazon-en-GB", "ddg", "ebay-es", "wikipedia-eu" ++ "ddg", "google-b-d", "bing", "amazon-en-GB", "ebay-es", "wikipedia-eu" + ] + } + }, + "fa": { + "default": { + "visibleDefaultEngines": [ +- "google-b-d", "amazondotcom", "bing", "ddg", "wikipedia-fa" ++ "ddg", "google-b-d", "amazondotcom", "bing", "wikipedia-fa" + ] + } + }, + "ff": { + "default": { + "visibleDefaultEngines": [ +- "google-b-d", "bing", "amazon-france", "ddg", "wikipedia-fr" ++ "ddg", "google-b-d", "bing", "amazon-france", "wikipedia-fr" + ] + } + }, + "fi": { + "default": { + "visibleDefaultEngines": [ +- "google-b-d", "bing", "ddg", "wikipedia-fi" ++ "ddg", "google-b-d", "bing", "wikipedia-fi" + ] + } + }, + "fr": { + "default": { + "visibleDefaultEngines": [ +- "google-b-d", "bing", "amazon-france", "ddg", "ebay-fr", "qwant", "wikipedia-fr" ++ "ddg", "google-b-d", "bing", "amazon-france", "ebay-fr", "qwant", "wikipedia-fr" + ] + } + }, + "fy-NL": { + "default": { + "visibleDefaultEngines": [ +- "google-b-d", "bing", "bolcom-fy-NL", "ddg", "ebay-nl", "marktplaats-fy-NL", "wikipedia-fy-NL" ++ "ddg", "google-b-d", "bing", "bolcom-fy-NL", "ebay-nl", "marktplaats-fy-NL", "wikipedia-fy-NL" + ] + }, + "experimental-hidden": { +@@ -461,105 +461,105 @@ + "ga-IE": { + "default": { + "visibleDefaultEngines": [ +- "google-b-d", "amazon-en-GB", "ddg", "ebay-ie", "tearma", "twitter", "wikipedia-ga-IE" ++ "ddg", "google-b-d", "amazon-en-GB", "ebay-ie", "tearma", "twitter", "wikipedia-ga-IE" + ] + } + }, + "gd": { + "default": { + "visibleDefaultEngines": [ +- "google-b-d", "amazon-en-GB", "bbc-alba", "ddg", "ebay-uk", "faclair-beag", "wikipedia-gd" ++ "ddg", "google-b-d", "amazon-en-GB", "bbc-alba", "ebay-uk", "faclair-beag", "wikipedia-gd" + ] + } + }, + "gl": { + "default": { + "visibleDefaultEngines": [ +- "google-b-d", "amazon-en-GB", "ddg", "ebay-es", "wikipedia-gl" ++ "ddg", "google-b-d", "amazon-en-GB", "ebay-es", "wikipedia-gl" + ] + } + }, + "gn": { + "default": { + "visibleDefaultEngines": [ +- "google-b-d", "bing", "amazondotcom", "ddg", "twitter", "wikipedia-gn" ++ "ddg", "google-b-d", "bing", "amazondotcom", "twitter", "wikipedia-gn" + ] + } + }, + "gu-IN": { + "default": { + "visibleDefaultEngines": [ +- "google-b-d", "bing", "amazon-in", "ddg", "wikipedia-gu" ++ "ddg", "google-b-d", "bing", "amazon-in", "wikipedia-gu" + ] + } + }, + "he": { + "default": { + "visibleDefaultEngines": [ +- "google-b-d", "ddg", "wikipedia-he", "morfix-dic" ++ "ddg", "google-b-d", "wikipedia-he", "morfix-dic" + ] + } + }, + "hi-IN": { + "default": { + "visibleDefaultEngines": [ +- "google-b-d", "bing", "ddg", "wikipedia-hi" ++ "ddg", "google-b-d", "bing", "wikipedia-hi" + ] + } + }, + "hr": { + "default": { + "visibleDefaultEngines": [ +- "google-b-d", "amazon-en-GB", "bing", "ddg", "eudict", "twitter", "wikipedia-hr" ++ "ddg", "google-b-d", "amazon-en-GB", "bing", "eudict", "twitter", "wikipedia-hr" + ] + } + }, + "hsb": { + "default": { + "visibleDefaultEngines": [ +- "google-b-d", "bing", "amazon-de", "ddg", "ebay-de", "leo_ende_de", "wikipedia-hsb" ++ "ddg", "google-b-d", "bing", "amazon-de", "ebay-de", "leo_ende_de", "wikipedia-hsb" + ] + } + }, + "hu": { + "default": { + "visibleDefaultEngines": [ +- "google-b-d", "ddg", "vatera", "wikipedia-hu" ++ "ddg", "google-b-d", "vatera", "wikipedia-hu" + ] + } + }, + "hy-AM": { + "default": { + "visibleDefaultEngines": [ +- "google-b-d", "amazondotcom", "ddg", "list-am", "wikipedia-hy" ++ "ddg", "google-b-d", "amazondotcom", "list-am", "wikipedia-hy" + ] + } + }, + "ia": { + "default": { + "visibleDefaultEngines": [ +- "google-b-d", "bing", "amazondotcom", "ddg", "twitter", "wikipedia-ia" ++ "ddg", "google-b-d", "bing", "amazondotcom", "twitter", "wikipedia-ia" + ] + } + }, + "id": { + "default": { + "visibleDefaultEngines": [ +- "google-b-d", "ddg", "wikipedia-id" ++ "ddg", "google-b-d", "wikipedia-id" + ] + } + }, + "is": { + "default": { + "visibleDefaultEngines": [ +- "google-b-d", "bing", "amazondotcom", "ddg", "wikipedia-is" ++ "ddg", "google-b-d", "bing", "amazondotcom", "wikipedia-is" + ] + } + }, + "it": { + "default": { + "visibleDefaultEngines": [ +- "google-b-d", "bing", "amazon-it", "ddg", "ebay-it", "wikipedia-it" ++ "ddg", "google-b-d", "bing", "amazon-it", "ebay-it", "wikipedia-it" + ] + } + }, +@@ -567,7 +567,7 @@ + "default": { + "searchOrder": ["Google", "Yahoo! JAPAN", "Bing", "Amazon.co.jp", "楽天市場", "ヤフオク!", "教えて!goo", "Twitter", "Wikipedia (ja)"], + "visibleDefaultEngines": [ +- "google-b-d", "yahoo-jp", "bing", "amazon-jp", "rakuten", "yahoo-jp-auctions", "oshiete-goo", "twitter-ja", "wikipedia-ja", "ddg" ++ "ddg", "google-b-d", "yahoo-jp", "bing", "amazon-jp", "rakuten", "yahoo-jp-auctions", "oshiete-goo", "twitter-ja", "wikipedia-ja" + ] + } + }, +@@ -575,159 +575,159 @@ + "default": { + "searchOrder": ["Google", "Yahoo! JAPAN", "Bing", "Amazon.co.jp", "楽天市場", "ヤフオク!", "教えて!goo", "Twitter", "Wikipedia (ja)"], + "visibleDefaultEngines": [ +- "google-b-d", "yahoo-jp", "bing", "amazon-jp", "rakuten", "yahoo-jp-auctions", "oshiete-goo", "twitter-ja", "wikipedia-ja", "ddg" ++ "ddg", "google-b-d", "yahoo-jp", "bing", "amazon-jp", "rakuten", "yahoo-jp-auctions", "oshiete-goo", "twitter-ja", "wikipedia-ja" + ] + } + }, + "ka": { + "default": { + "visibleDefaultEngines": [ +- "google-b-d", "bing", "amazondotcom", "ddg", "twitter", "wikipedia-ka" ++ "ddg", "google-b-d", "bing", "amazondotcom", "twitter", "wikipedia-ka" + ] + } + }, + "kab": { + "default": { + "visibleDefaultEngines": [ +- "google-b-d", "bing", "ddg", "wikipedia-kab" ++ "ddg", "google-b-d", "bing", "wikipedia-kab" + ] + } + }, + "kk": { + "default": { + "visibleDefaultEngines": [ +- "yandex-kk", "google-b-d", "ddg", "flip", "twitter", "wikipedia-kk" ++ "ddg", "yandex-kk", "google-b-d", "flip", "twitter", "wikipedia-kk" + ] + }, + "KZ": { +- "searchDefault": "Яндекс" ++ "searchDefault": "DuckDuckGo" + }, + "BY": { +- "searchDefault": "Яндекс" ++ "searchDefault": "DuckDuckGo" + }, + "RU": { +- "searchDefault": "Яндекс" ++ "searchDefault": "DuckDuckGo" + }, + "TR": { +- "searchDefault": "Яндекс" ++ "searchDefault": "DuckDuckGo" + } + }, + "km": { + "default": { + "visibleDefaultEngines": [ +- "google-b-d", "bing", "amazondotcom", "ddg", "twitter", "wikipedia-km" ++ "ddg", "google-b-d", "bing", "amazondotcom", "twitter", "wikipedia-km" + ] + } + }, + "kn": { + "default": { + "visibleDefaultEngines": [ +- "google-b-d", "bing", "amazon-in", "ddg", "kannadastore", "wikipedia-kn" ++ "ddg", "google-b-d", "bing", "amazon-in", "kannadastore", "wikipedia-kn" + ] + } + }, + "ko": { + "default": { + "visibleDefaultEngines": [ +- "google-b-d", "ddg", "naver-kr", "daum-kr", "wikipedia-kr" ++ "ddg", "google-b-d", "naver-kr", "daum-kr", "wikipedia-kr" + ] + } + }, + "lij": { + "default": { + "visibleDefaultEngines": [ +- "google-b-d", "bing", "amazon-it", "ddg", "ebay-it", "wikipedia-lij" ++ "ddg", "google-b-d", "bing", "amazon-it", "ebay-it", "wikipedia-lij" + ] + } + }, + "lo": { + "default": { + "visibleDefaultEngines": [ +- "google-b-d", "bing", "ddg", "wikipedia-lo", "twitter" ++ "ddg", "google-b-d", "bing", "wikipedia-lo", "twitter" + ] + } + }, + "lt": { + "default": { + "visibleDefaultEngines": [ +- "google-b-d", "wikipedia-lt", "bing", "amazondotcom", "ddg", "twitter" ++ "ddg", "google-b-d", "wikipedia-lt", "bing", "amazondotcom", "twitter" + ] + } + }, + "ltg": { + "default": { + "visibleDefaultEngines": [ +- "google-b-d", "ddg", "salidzinilv", "sslv", "wikipedia-ltg" ++ "ddg", "google-b-d", "salidzinilv", "sslv", "wikipedia-ltg" + ] + } + }, + "lv": { + "default": { + "visibleDefaultEngines": [ +- "google-b-d", "ddg", "salidzinilv", "sslv", "wikipedia-lv" ++ "ddg", "google-b-d", "salidzinilv", "sslv", "wikipedia-lv" + ] + } + }, + "mai": { + "default": { + "visibleDefaultEngines": [ +- "google-b-d", "bing", "amazon-in", "ddg", "twitter", "wikipedia-hi" ++ "ddg", "google-b-d", "bing", "amazon-in", "twitter", "wikipedia-hi" + ] + } + }, + "mk": { + "default": { + "visibleDefaultEngines": [ +- "google-b-d", "bing", "amazondotcom", "ddg", "wikipedia-mk" ++ "ddg", "google-b-d", "bing", "amazondotcom", "wikipedia-mk" + ] + } + }, + "ml": { + "default": { + "visibleDefaultEngines": [ +- "google-b-d", "bing", "amazon-in", "ddg", "wikipedia", "wikipedia-ml" ++ "ddg", "google-b-d", "bing", "amazon-in", "wikipedia", "wikipedia-ml" + ] + } + }, + "mr": { + "default": { + "visibleDefaultEngines": [ +- "google-b-d", "amazon-in", "ddg", "wikipedia-mr" ++ "ddg", "google-b-d", "amazon-in", "wikipedia-mr" + ] + } + }, + "ms": { + "default": { + "visibleDefaultEngines": [ +- "google-b-d", "bing", "amazondotcom", "ddg", "twitter", "wikipedia-ms" ++ "ddg", "google-b-d", "bing", "amazondotcom", "twitter", "wikipedia-ms" + ] + } + }, + "my": { + "default": { + "visibleDefaultEngines": [ +- "google-b-d", "bing", "amazondotcom", "ddg", "twitter", "wikipedia-my" ++ "ddg", "google-b-d", "bing", "amazondotcom", "twitter", "wikipedia-my" + ] + } + }, + "nb-NO": { + "default": { + "visibleDefaultEngines": [ +- "google-b-d", "amazon-en-GB", "bing", "ddg", "gulesider-NO", "bok-NO", "qxl-NO", "wikipedia-NO" ++ "ddg", "google-b-d", "amazon-en-GB", "bing", "gulesider-NO", "bok-NO", "qxl-NO", "wikipedia-NO" + ] + } + }, + "ne-NP": { + "default": { + "visibleDefaultEngines": [ +- "google-b-d", "bing", "ddg", "twitter", "wikipedia-ne" ++ "ddg", "google-b-d", "bing", "twitter", "wikipedia-ne" + ] + } + }, + "nl": { + "default": { + "visibleDefaultEngines": [ +- "google-b-d", "bing", "bolcom-nl", "ddg", "ebay-nl", "marktplaats-nl", "wikipedia-nl" ++ "ddg", "google-b-d", "bing", "bolcom-nl", "ebay-nl", "marktplaats-nl", "wikipedia-nl" + ] + }, + "experimental-hidden": { +@@ -739,244 +739,244 @@ + "nn-NO": { + "default": { + "visibleDefaultEngines": [ +- "google-b-d", "bing", "amazon-en-GB", "ddg", "gulesider-NO", "bok-NO", "qxl-NO", "wikipedia-NN" ++ "ddg", "google-b-d", "bing", "amazon-en-GB", "gulesider-NO", "bok-NO", "qxl-NO", "wikipedia-NN" + ] + } + }, + "oc": { + "default": { + "visibleDefaultEngines": [ +- "google-b-d", "bing", "ddg", "twitter", "wikipedia-oc", "wiktionary-oc" ++ "ddg", "google-b-d", "bing", "twitter", "wikipedia-oc", "wiktionary-oc" + ] + } + }, + "or": { + "default": { + "visibleDefaultEngines": [ +- "google-b-d", "bing", "amazon-in", "ddg", "wikipedia-or" ++ "ddg", "google-b-d", "bing", "amazon-in", "wikipedia-or" + ] + } + }, + "pa-IN": { + "default": { + "visibleDefaultEngines": [ +- "google-b-d", "bing", "amazon-in", "ddg", "wikipedia-pa" ++ "ddg", "google-b-d", "bing", "amazon-in", "wikipedia-pa" + ] + } + }, + "pl": { + "default": { + "visibleDefaultEngines": [ +- "google-b-d", "allegro-pl", "ddg", "pwn-pl", "wikipedia-pl", "wolnelektury-pl" ++ "ddg", "google-b-d", "allegro-pl", "pwn-pl", "wikipedia-pl", "wolnelektury-pl" + ] + } + }, + "pt-BR": { + "default": { + "visibleDefaultEngines": [ +- "google-b-d", "bing", "ddg", "mercadolivre", "twitter", "wikipedia-pt" ++ "ddg", "google-b-d", "bing", "mercadolivre", "twitter", "wikipedia-pt" + ] + } + }, + "pt-PT": { + "default": { + "visibleDefaultEngines": [ +- "google-b-d", "amazon-en-GB", "ddg", "priberam", "wikipedia-pt" ++ "ddg", "google-b-d", "amazon-en-GB", "priberam", "wikipedia-pt" + ] + } + }, + "rm": { + "default": { + "visibleDefaultEngines": [ +- "google-b-d", "bing", "ddg", "ebay-ch", "leo_ende_de", "wikipedia-rm" ++ "ddg", "google-b-d", "bing", "ebay-ch", "leo_ende_de", "wikipedia-rm" + ] + } + }, + "ro": { + "default": { + "visibleDefaultEngines": [ +- "google-b-d", "bing", "amazondotcom", "ddg", "wikipedia-ro" ++ "ddg", "google-b-d", "bing", "amazondotcom", "wikipedia-ro" + ] + } + }, + "ru": { + "default": { + "visibleDefaultEngines": [ +- "yandex-ru", "google-b-d", "ddg", "ozonru", "priceru", "wikipedia-ru", "mailru" ++ "ddg", "yandex-ru", "google-b-d", "ozonru", "priceru", "wikipedia-ru", "mailru" + ] + }, + "RU": { +- "searchDefault": "Яндекс" ++ "searchDefault": "DuckDuckGo" + }, + "BY": { +- "searchDefault": "Яндекс" ++ "searchDefault": "DuckDuckGo" + }, + "KZ": { +- "searchDefault": "Яндекс" ++ "searchDefault": "DuckDuckGo" + }, + "TR": { +- "searchDefault": "Яндекс" ++ "searchDefault": "DuckDuckGo" + } + }, + "si": { + "default": { + "visibleDefaultEngines": [ +- "google-b-d", "amazondotcom", "ddg", "wikipedia-si" ++ "ddg", "google-b-d", "amazondotcom", "wikipedia-si" + ] + } + }, + "sk": { + "default": { + "visibleDefaultEngines": [ +- "google-b-d", "azet-sk", "atlas-sk", "ddg", "wikipedia-sk", "zoznam-sk" ++ "ddg", "google-b-d", "azet-sk", "atlas-sk", "wikipedia-sk", "zoznam-sk" + ] + } + }, + "sl": { + "default": { + "visibleDefaultEngines": [ +- "google-b-d", "ceneji", "ddg", "najdi-si", "odpiralni", "twitter", "wikipedia-sl" ++ "ddg", "google-b-d", "ceneji", "najdi-si", "odpiralni", "twitter", "wikipedia-sl" + ] + } + }, + "son": { + "default": { + "visibleDefaultEngines": [ +- "google-b-d", "bing", "amazon-france", "ddg", "wikipedia-fr" ++ "ddg", "google-b-d", "bing", "amazon-france", "wikipedia-fr" + ] + } + }, + "sq": { + "default": { + "visibleDefaultEngines": [ +- "google-b-d", "bing", "amazon-en-GB", "ddg", "wikipedia-sq" ++ "ddg", "google-b-d", "bing", "amazon-en-GB", "wikipedia-sq" + ] + } + }, + "sr": { + "default": { + "visibleDefaultEngines": [ +- "google-b-d", "amazon-en-GB", "bing", "ddg", "wikipedia-sr", "pogodak" ++ "ddg", "google-b-d", "amazon-en-GB", "bing", "wikipedia-sr", "pogodak" + ] + } + }, + "sv-SE": { + "default": { + "visibleDefaultEngines": [ +- "google-b-d", "bing", "allaannonser-sv-SE", "ddg", "prisjakt-sv-SE", "tyda-sv-SE", "wikipedia-sv-SE" ++ "ddg", "google-b-d", "bing", "allaannonser-sv-SE", "prisjakt-sv-SE", "tyda-sv-SE", "wikipedia-sv-SE" + ] + } + }, + "ta": { + "default": { + "visibleDefaultEngines": [ +- "google-b-d", "amazon-in", "ddg", "wikipedia-ta" ++ "ddg", "google-b-d", "amazon-in", "wikipedia-ta" + ] + } + }, + "te": { + "default": { + "visibleDefaultEngines": [ +- "google-b-d", "amazon-in", "ddg", "wikipedia-te", "wiktionary-te" ++ "ddg", "google-b-d", "amazon-in", "wikipedia-te", "wiktionary-te" + ] + } + }, + "th": { + "default": { + "visibleDefaultEngines": [ +- "google-b-d", "amazondotcom", "bing", "ddg", "longdo", "wikipedia-th" ++ "ddg", "google-b-d", "amazondotcom", "bing", "longdo", "wikipedia-th" + ] + } + }, + "tl": { + "default": { + "visibleDefaultEngines": [ +- "google-b-d", "bing", "amazondotcom", "ddg", "twitter", "wikipedia-tl" ++ "ddg", "google-b-d", "bing", "amazondotcom", "twitter", "wikipedia-tl" + ] + } + }, + "tr": { + "default": { + "visibleDefaultEngines": [ +- "yandex-tr", "google-b-d", "ddg", "twitter", "wikipedia-tr" ++ "ddg", "yandex-tr", "google-b-d", "twitter", "wikipedia-tr" + ] + }, + "TR": { +- "searchDefault": "Yandex" ++ "searchDefault": "DuckDuckGo" + }, + "BY": { +- "searchDefault": "Yandex" ++ "searchDefault": "DuckDuckGo" + }, + "KZ": { +- "searchDefault": "Yandex" ++ "searchDefault": "DuckDuckGo" + }, + "RU": { +- "searchDefault": "Yandex" ++ "searchDefault": "DuckDuckGo" + } + }, + "trs": { + "default": { + "visibleDefaultEngines": [ +- "google-b-d", "bing", "amazondotcom", "ddg", "wikipedia-es" ++ "ddg", "google-b-d", "bing", "amazondotcom", "wikipedia-es" + ] + } + }, + "uk": { + "default": { + "visibleDefaultEngines": [ +- "google-b-d", "bing", "ddg", "wikipedia-uk", "hotline-ua" ++ "ddg", "google-b-d", "bing", "wikipedia-uk", "hotline-ua" + ] + } + }, + "ur": { + "default": { + "visibleDefaultEngines": [ +- "google-b-d", "bing", "amazon-in", "ddg", "twitter", "wikipedia-ur" ++ "ddg", "google-b-d", "bing", "amazon-in", "twitter", "wikipedia-ur" + ] + } + }, + "uz": { + "default": { + "visibleDefaultEngines": [ +- "google-b-d", "bing", "amazondotcom", "ddg", "twitter", "wikipedia-uz" ++ "ddg", "google-b-d", "bing", "amazondotcom", "twitter", "wikipedia-uz" + ] + } + }, + "vi": { + "default": { + "visibleDefaultEngines": [ +- "google-b-d", "coccoc", "ddg", "wikipedia-vi" ++ "ddg", "google-b-d", "coccoc", "wikipedia-vi" + ] + } + }, + "wo": { + "default": { + "visibleDefaultEngines": [ +- "google-b-d", "bing", "amazon-france", "ddg", "ebay-fr", "twitter", "wikipedia-wo" ++ "ddg", "google-b-d", "bing", "amazon-france", "ebay-fr", "twitter", "wikipedia-wo" + ] + } + }, + "xh": { + "default": { + "visibleDefaultEngines": [ +- "google-b-d", "bing", "ddg", "wikipedia" ++ "ddg", "google-b-d", "bing", "wikipedia" + ] + } + }, + "zh-CN": { + "default": { + "visibleDefaultEngines": [ +- "baidu", "google-b-d", "bing", "ddg", "wikipedia-zh-CN", "amazondotcn" ++ "ddg", "baidu", "google-b-d", "bing", "wikipedia-zh-CN", "amazondotcn" + ] + }, + "CN": { +- "searchDefault": "百度" ++ "searchDefault": "DuckDuckGo" + } + }, + "zh-TW": { + "default": { + "visibleDefaultEngines": [ +- "google-b-d", "ddg", "readmoo", "wikipedia-zh-TW" ++ "ddg", "google-b-d", "readmoo", "wikipedia-zh-TW" + ] + } + } diff --git a/gnu/packages/patches/icecat-disable-sync.patch b/gnu/packages/patches/icecat-disable-sync.patch new file mode 100644 index 0000000000..6d4459ee31 --- /dev/null +++ b/gnu/packages/patches/icecat-disable-sync.patch @@ -0,0 +1,9 @@ +--- a/browser/app/profile/icecat.js.orig 1980-01-01 18:59:51.000000000 -0500 ++++ b/browser/app/profile/icecat.js 2019-10-25 06:24:03.065989309 -0400 +@@ -2275,3 +2275,6 @@ + pref("general.buildID.override", "Gecko/20100101"); + pref("general.oscpu.override", "Windows NT 6.1"); + pref("general.platform.override", "Win32"); ++ ++// Disable Firefox Accounts and Sign in to Sync. ++pref("identity.fxaccounts.enabled", false); diff --git a/gnu/packages/patches/icecat-makeicecat.patch b/gnu/packages/patches/icecat-makeicecat.patch index 7d4f774c83..f0b36d7d52 100644 --- a/gnu/packages/patches/icecat-makeicecat.patch +++ b/gnu/packages/patches/icecat-makeicecat.patch @@ -3,16 +3,16 @@ in a snippet without network access. After this patch is applied, some additional changes will be made using 'substitute*'. diff --git a/makeicecat b/makeicecat -index 5a4390b..fcfa143 100644 +index b04c731..06d1f3f 100644 --- a/makeicecat +++ b/makeicecat -@@ -29,55 +29,55 @@ SOURCEDIR=icecat-$FFVERSION +@@ -30,55 +30,55 @@ SOURCEDIR=icecat-$FFVERSION DATA="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"/data --mkdir output +-mkdir -p output -cd output -+# mkdir output ++# mkdir -p output +# cd output ############################################################################### @@ -23,9 +23,9 @@ index 5a4390b..fcfa143 100644 - -wget -N https://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${FFVERSION}esr/source/firefox-${FFVERSION}esr.source.tar.xz -wget -N https://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${FFVERSION}esr/source/firefox-${FFVERSION}esr.source.tar.xz.asc --gpg --recv-keys --keyserver keyserver.ubuntu.com 24C6F355 +-gpg --recv-keys --keyserver keyserver.ubuntu.com 14F26682D0916CDD81E37B6D61B7B526D98F0353 -gpg --verify firefox-${FFVERSION}esr.source.tar.xz.asc --echo -n 0a5f0c1d8d1e9443d85083d37fec32e5cc15c1001ea992d49745490065b4a023 firefox-${FFVERSION}esr.source.tar.xz |sha256sum -c - +-echo -n f56f5fa5a4744be0b9acf259cb991254d708a50b9a0a12d1d846ffa5a6c409ac firefox-${FFVERSION}esr.source.tar.xz |sha256sum -c - - -echo Extracting Firefox tarball -tar -xf firefox-${FFVERSION}esr.source.tar.xz @@ -35,9 +35,9 @@ index 5a4390b..fcfa143 100644 +# +# wget -N https://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${FFVERSION}esr/source/firefox-${FFVERSION}esr.source.tar.xz +# wget -N https://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${FFVERSION}esr/source/firefox-${FFVERSION}esr.source.tar.xz.asc -+# gpg --recv-keys --keyserver keyserver.ubuntu.com 24C6F355 ++# gpg --recv-keys --keyserver keyserver.ubuntu.com 14F26682D0916CDD81E37B6D61B7B526D98F0353 +# gpg --verify firefox-${FFVERSION}esr.source.tar.xz.asc -+# echo -n 0a5f0c1d8d1e9443d85083d37fec32e5cc15c1001ea992d49745490065b4a023 firefox-${FFVERSION}esr.source.tar.xz |sha256sum -c - ++# echo -n f56f5fa5a4744be0b9acf259cb991254d708a50b9a0a12d1d846ffa5a6c409ac firefox-${FFVERSION}esr.source.tar.xz |sha256sum -c - +# +# echo Extracting Firefox tarball +# tar -xf firefox-${FFVERSION}esr.source.tar.xz @@ -98,7 +98,22 @@ index 5a4390b..fcfa143 100644 #for patch in $DATA/patches/*; do # echo Patching with file: $patch -@@ -590,6 +590,6 @@ sed 's/777/755/;' -i toolkit/crashreporter/google-breakpad/Makefile.in +@@ -226,10 +226,10 @@ cp $DATA/bookmarks.html.in browser/locales/generic/profile/bookmarks.html.in + + find -wholename '*/brand.dtd' |xargs /bin/sed 's/trademarkInfo.part1.*/trademarkInfo.part1 "">/' -i + +-for STRING in rights.intro-point3-unbranded rights.intro-point4a-unbranded rights.intro-point4b-unbranded rights.intro-point4c-unbranded +-do +- find -name aboutRights.dtd | xargs sed -i "s/ENTITY $STRING.*/ENTITY $STRING \"\">/" +-done ++# for STRING in rights.intro-point3-unbranded rights.intro-point4a-unbranded rights.intro-point4b-unbranded rights.intro-point4c-unbranded ++# do ++# find -name aboutRights.dtd | xargs sed -i "s/ENTITY $STRING.*/ENTITY $STRING \"\">/" ++# done + + for STRING in rights-intro-point-2 rights-intro-point-3 rights-intro-point-4 rights-intro-point-5 rights-intro-point-6 rights-webservices rights-safebrowsing + do +@@ -595,6 +595,6 @@ sed 's/777/755/;' -i toolkit/crashreporter/google-breakpad/Makefile.in # Fix CVE-2012-3386 /bin/sed 's/chmod a+w/chmod u+w/' -i ./js/src/ctypes/libffi/Makefile.in ./toolkit/crashreporter/google-breakpad/Makefile.in ./toolkit/crashreporter/google-breakpad/src/third_party/glog/Makefile.in || true |