diff options
author | Luke Shumaker <lukeshu@sbcglobal.net> | 2016-11-20 19:06:00 -0500 |
---|---|---|
committer | Luke Shumaker <lukeshu@sbcglobal.net> | 2016-11-20 19:06:00 -0500 |
commit | a1652ed939347bcb278a41363c4f58e9493addc4 (patch) | |
tree | 423734b45d1016c488eee55311fcefb932d5304b | |
parent | 7d6c91248fffdb97db1fd1aaf43b15d1dcff5dd3 (diff) | |
parent | d6c8481df72f67b3ee967c25128bc4706c4cff7f (diff) | |
download | abslibre-a1652ed939347bcb278a41363c4f58e9493addc4.tar.gz abslibre-a1652ed939347bcb278a41363c4f58e9493addc4.tar.bz2 abslibre-a1652ed939347bcb278a41363c4f58e9493addc4.zip |
Merge branch 'master' of git://projects.parabola.nu/abslibre/abslibre
-rw-r--r-- | libre/iceweasel/PKGBUILD | 4 | ||||
-rw-r--r-- | libre/iceweasel/vendor.js | 3 | ||||
-rw-r--r-- | libre/mozilla-searchplugins/PKGBUILD | 6 | ||||
-rw-r--r-- | libre/mozilla-searchplugins/yacy.xml | 17 | ||||
-rw-r--r-- | nonprism/iceweasel-hardened/PKGBUILD | 6 | ||||
-rw-r--r-- | nonprism/iceweasel-hardened/iceweasel.desktop | 10 | ||||
-rw-r--r-- | nonprism/iceweasel-hardened/vendor.js | 1 |
7 files changed, 26 insertions, 21 deletions
diff --git a/libre/iceweasel/PKGBUILD b/libre/iceweasel/PKGBUILD index 0b5c56c4d..c1c5f7d40 100644 --- a/libre/iceweasel/PKGBUILD +++ b/libre/iceweasel/PKGBUILD @@ -30,7 +30,7 @@ _pkgname=firefox pkgname=iceweasel epoch=1 pkgver=$_debver.$_debrel -pkgrel=1 +pkgrel=2 pkgdesc="A libre version of Debian Iceweasel, the standalone web browser based on Mozilla Firefox." arch=(i686 x86_64 armv7h) license=(MPL GPL LGPL) @@ -77,7 +77,7 @@ sha256sums=('4be6b691ffc1ac91707c2ced606a0c5fe6620272684f92265f35ef42e19151c5' '56eba484179c7f498076f8dc603d8795e99dce8c6ea1da9736318c59d666bff6' '87034dbb640f70454b27d1695a6f03b6fd1ab81c82eb4d8c771db925ae03d408' '3aea6676f1e53a09673b6ae219d281fc28054beb6002b09973611c02f827651d' - '927a5b01f82af5ca8de024d62031a79faa0dad4746e3acbd968da41a81b15b23' + '9ba0053006d3ed1e59c8aa0c0b3c708501e7b60b9d3f7008b6c282b2de5ce870' 'f61ea706ce6905f568b9bdafd1b044b58f20737426f0aa5019ddb9b64031a269' '9765bca5d63fb5525bbd0520b7ab1d27cabaed697e2fc7791400abc3fa4f13b8' 'e260e555b261aabab1e48786dd514eeea056e4402af7cfd4dfd1d32858441484' diff --git a/libre/iceweasel/vendor.js b/libre/iceweasel/vendor.js index 2be227f0e..9941c3f14 100644 --- a/libre/iceweasel/vendor.js +++ b/libre/iceweasel/vendor.js @@ -144,9 +144,10 @@ pref("app.update.auto", false); pref("font.default.x-western", "sans-serif"); -// Preferences for the Get Add-ons panel +// Preferences for the Get Add-ons panel and search engines pref ("extensions.webservice.discoverURL", "https://directory.fsf.org/wiki/GNU_IceCat"); pref ("extensions.getAddons.search.url", "https://directory.fsf.org/wiki/GNU_IceCat"); +pref ("browser.search.searchEnginesURL", "https://directory.fsf.org/wiki/GNU_IceCat"); // Mobile pref("privacy.announcements.enabled", false); diff --git a/libre/mozilla-searchplugins/PKGBUILD b/libre/mozilla-searchplugins/PKGBUILD index 832756cbf..e3cd74ba5 100644 --- a/libre/mozilla-searchplugins/PKGBUILD +++ b/libre/mozilla-searchplugins/PKGBUILD @@ -9,7 +9,7 @@ # Contributor: Muhammad 'MJ' Jassim <UnbreakableMJ@gmail.com> pkgname=mozilla-searchplugins -pkgver=1.9 +pkgver=1.10 pkgrel=1 pkgdesc="System-wide OpenSearch plugins common for Mozilla based browsers." arch=('any') @@ -38,9 +38,9 @@ sha256sums=('f05c7f1505a2511ccb5a58174ed52605238431ae880e526176393fe72b73ffb9' '3e95dff7d062889c86531aa80962b80e3c0d6c87244ec838963b313193c3f367' 'cd8e9eb45567cb362acf607e65fcabfaf682f0051a251aa6a616ca25cd77106e' '1cd8dc8d1275a4e1fa10187997a0558f578c21a91e97c48222448e485de35d6a' - '7ee18525957e05326db0bb2d6264bdceaf754b4df0a2fbe27d36707b7afae821' + 'c97928bf25bff6c11d3cdb8f0df68b04c743a8fb3c8c51511e9179754d7fb231' 'ec4a1054f4b9cca9cf410b3302fa86e2322a8dfdfe560b5dbbabba7d0bdd3197' '2480ca917a10d0955b818498171ecff6b86faf2eeae25684dd617ec4da40d585' '5e249e946193da91c95ade7f60fe227c28b99ecf40aba717b77d004ac9080905' - '8ed0e09a96020c5ba0df60b74c37a23d1bb1f2c80b04608abed3d1d450001722' + '11aefd859c970b1bfce755b32177e5f608d39a0cad0b3d3b0b47f49437f35225' '44d8d849806e21a8e32489ade3e8191c4b4b23b416632beb258dea2484ed4ea3') diff --git a/libre/mozilla-searchplugins/yacy.xml b/libre/mozilla-searchplugins/yacy.xml index 15e094661..52d9f66c3 100644 --- a/libre/mozilla-searchplugins/yacy.xml +++ b/libre/mozilla-searchplugins/yacy.xml @@ -4,6 +4,7 @@ xmlns:suggestions="http://www.opensearch.org/specifications/opensearch/extensions/suggestions/1.1"> <ShortName>YaCy</ShortName> <LongName>YaCy.net - Web Search by the People, for the People</LongName> + <Image type="image/gif">http://yacy.searchlab.eu/env/grafics/yacy.png</Image> <Image width="16" height="16">data:image/x-icon;base64,AAABAAEAEBAAAAAAGABoAwAAFgAAACgAAAAQAAAAIAAAAAEAGAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD////////Chiu+fBm+fRq+fRq+fRq+fRq+fRq8ehXMmk////////////////////////////++exjUqGfZsnjYsXbYsXbYsXbZsnjTp2W+fBr///////////////////////////+9exfs2r/69/L58+z58+z58+z59e/z59bChSn///////////////////////////+9fBnnz638+fX69O369e748un38Ob59O3Ll0fVrGz////////////////////////Jk0HJlUjXuYrWt4jVtYPr28T58+r59OzPn1fPnlX////////////////////////Rolu8eRXCiTPEjTvCijbNnlj169359e7Zs3vLlkf////////////////////////UqmrAgSLt3MP27eH1693169327+T59Ozo0rG/gB////////////////////////////+/gCDv4Mn48+v38Of59Oz58+v48+vr2b2+fRv///////////////////////////+9ehXr17n58+z48ejo0bDp07T48+zx49DBhCj///////////////////////////+/fhzjyJ/59Oz59OzQoVvNmU759Oz58+vKlUbXrnH////////////////////////LlkfUqmn59Oz48+vZtHzNm1D48+v59OzPoFjOnlX////////////////////////OnVPOnFL59e348+vq1rnEiC7u38j69vDXsHTIkT3////////////////////////UqWjIkD327+T58+3s2bzAgSLp07T79/Pmzqq+fBn///////////////////////////+/fx7v4Mr7+PTx5NDHkD3kyqP8+vjs2r+9exf///////////////////////////++fBjQoFnVq2zTp2bGjTjJk0LWrW7SpWC+exf////////////////////////////Nm1C6dQy7eBG8eBK9exe8ehS7dxC6dQzLlkj////////////AH///wB8x+sAf///AD/+PwA///8AP///AD///4A9PU+APoz/gB///4AdxvOAHoz/gB3368AfjU/AHT1PwB/+P </Image> <Language>en-us</Language> @@ -12,17 +13,19 @@ <AdultContent>true</AdultContent> <Description>YaCy is a free GPL-licensed software that can be used for stand-alone search engine installations or as a client for a multi-user P2P-based web indexing cluster. This is the access to peer.</Description> - <Url type="text/html" method="GET" template="http://search.yacy.net/yacysearch.html?query={searchTerms}&startRecord={startIndex?}&maximumRecords={count?}&nav=all&resource=global" /> - <Url type="application/rss+xml" method="GET" template="http://search.yacy.net/yacysearch.rss?nav=&query={searchTerms}&startRecord={startIndex?}&maximumRecords={count?}&nav=all&resource=global" /> - <Url type="application/atom+xml" method="GET" template="http://search.yacy.net/yacysearch.atom?query={searchTerms}&startRecord={startIndex?}&maximumRecords={count?}&resource=global" /> + <Url type="text/html" method="GET" template="http://yacy.searchlab.eu/yacysearch.html?query={searchTerms}&startRecord={startIndex?}&maximumRecords={count?}&nav=all&resource=global" /> + <Url type="application/rss+xml" method="GET" template="http://yacy.searchlab.eu/yacysearch.rss?nav=&query={searchTerms}&startRecord={startIndex?}&maximumRecords={count?}&nav=all&resource=global" /> + <Url type="application/atom+xml" method="GET" template="http://yacy.searchlab.eu/yacysearch.atom?query={searchTerms}&startRecord={startIndex?}&maximumRecords={count?}&resource=global" /> + + <Url type="text/html" method="GET" template="http://yacy.searchlab.eu/compare_yacy.html?query={searchTerms}&left=#[search_left]#&right=#[search_right]#&display=2" /> - <Url type="application/x-suggestions+json" template="http://search.yacy.net/suggest.json?query={searchTerms}"/> - <Url type="application/x-suggestions+xml" template="http://search.yacy.net/suggest.xml?query={searchTerms}"/> + <Url type="application/x-suggestions+json" template="http://yacy.searchlab.eu/suggest.json?query={searchTerms}"/> + <Url type="application/x-suggestions+xml" template="http://yacy.searchlab.eu/suggest.xml?query={searchTerms}"/> <!-- syntax according to http://www.loc.gov/standards/sru/. Set verify=true to get snippets in the search results --> - <Developer>See http://github.com/orgs/yacy/teams/yacy_developers</Developer> + <Developer>See https://github.com/orgs/yacy/teams/yacy_developers</Developer> <Query role="example" searchTerms="yacy+free+software" /> <Tags>YaCy Free Software P2P Peer-to-Peer Uncensored Distributed Web Search Engine</Tags> - <Contact>See http://search.yacy.net/ViewProfile.html?hash=localhash</Contact> + <Contact>See http://yacy.searchlab.eu/ViewProfile.html?hash=localhash</Contact> <Attribution>http://yacy.net YaCy Software &copy; 2004-2014 by Michael Christen et al., YaCy.net; Content: ask peer owner</Attribution> <SyndicationRight>open</SyndicationRight> </OpenSearchDescription> diff --git a/nonprism/iceweasel-hardened/PKGBUILD b/nonprism/iceweasel-hardened/PKGBUILD index 33310cf9f..5bca775f7 100644 --- a/nonprism/iceweasel-hardened/PKGBUILD +++ b/nonprism/iceweasel-hardened/PKGBUILD @@ -30,7 +30,7 @@ _pkgname=firefox pkgname=iceweasel-hardened epoch=1 pkgver=$_debver.$_debrel -pkgrel=1 +pkgrel=2 pkgdesc="A libre version of Debian Iceweasel, the standalone web browser based on Mozilla Firefox, with several patches that were introduced to strengthen and protect the end user from security threats" arch=(i686 x86_64 armv7h) license=(MPL GPL LGPL) @@ -77,9 +77,9 @@ sha256sums=('4be6b691ffc1ac91707c2ced606a0c5fe6620272684f92265f35ef42e19151c5' '32f1fe3ad4f80d0ae419064db2abe49b97cd7cb18c35d68be1a2befb60172a2a' '93e3001ce152e1d142619e215a9ef07dd429943b99d21726c25da9ceb31e31cd' '56eba484179c7f498076f8dc603d8795e99dce8c6ea1da9736318c59d666bff6' - '87034dbb640f70454b27d1695a6f03b6fd1ab81c82eb4d8c771db925ae03d408' + '016e7f48c0da37a8e336e25d8f64ecc0608a3510f2589d99bfd229c7e00b8924' '3aea6676f1e53a09673b6ae219d281fc28054beb6002b09973611c02f827651d' - '0287e33a31c488823d96c4f1943cc7ce8dbc72ed8f8f977bb441e0799891c41c' + '5ba27dd549ca93dfbcc947ff9989fc29399a4c8cf7ad99b7676cd2a9bd17093c' 'f61ea706ce6905f568b9bdafd1b044b58f20737426f0aa5019ddb9b64031a269' '9765bca5d63fb5525bbd0520b7ab1d27cabaed697e2fc7791400abc3fa4f13b8' 'e260e555b261aabab1e48786dd514eeea056e4402af7cfd4dfd1d32858441484' diff --git a/nonprism/iceweasel-hardened/iceweasel.desktop b/nonprism/iceweasel-hardened/iceweasel.desktop index 028aeffde..9598299ed 100644 --- a/nonprism/iceweasel-hardened/iceweasel.desktop +++ b/nonprism/iceweasel-hardened/iceweasel.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Version=1.0 -Name=Iceweasel +Name=Iceweasel-hardened GenericName=Web Browser GenericName[ar]=متصفح ويب GenericName[ast]=Restolador Web @@ -83,8 +83,8 @@ Comment[uk]=Перегляд сторінок Інтернету Comment[vi]=Để duyệt các trang web Comment[zh_CN]=浏览互联网 Comment[zh_TW]=瀏覽網際網路 -Exec=iceweasel %u -Icon=iceweasel +Exec=iceweasel-hardened %u +Icon=iceweasel-hardened Terminal=false Type=Application MimeType=text/html;text/xml;application/xhtml+xml;application/vnd.mozilla.xul+xml;text/mml;x-scheme-handler/http;x-scheme-handler/https; @@ -199,7 +199,7 @@ Name[wo]=Palanteer bu bees Name[xh]=Ifestile entsha Name[zh_CN]=新建窗口 Name[zh_TW]=開新視窗 -Exec=iceweasel --new-window %u +Exec=iceweasel-hardened --new-window %u [Desktop Action new-private-window] Name=New Private Window @@ -307,4 +307,4 @@ Name[wo]=Panlanteeru biir bu bees Name[xh]=Ifestile yangasese entsha Name[zh_CN]=新建隐私浏览窗口 Name[zh_TW]=新增隱私視窗 -Exec=iceweasel --private-window %u +Exec=iceweasel-hardened --private-window %u diff --git a/nonprism/iceweasel-hardened/vendor.js b/nonprism/iceweasel-hardened/vendor.js index fa254ce58..284e09735 100644 --- a/nonprism/iceweasel-hardened/vendor.js +++ b/nonprism/iceweasel-hardened/vendor.js @@ -1,6 +1,7 @@ pref("extensions.getAddons.search.url", "https://directory.fsf.org/wiki/GNU_IceCat"); pref("extensions.getAddons.link.url", "https://directory.fsf.org/wiki/GNU_IceCat"); pref("extensions.getAddons.search.browseURL", "https://directory.fsf.org/wiki/GNU_IceCat"); +pref("browser.search.searchEnginesURL", "https://directory.fsf.org/wiki/GNU_IceCat"); pref("accessibility.blockautorefresh", true); pref("browser.meta_refresh_when_inactive.disabled", true); pref("extensions.webservice.discoverURL", "https://directory.fsf.org/wiki/GNU_IceCat"); |