Merge branch 'master' of ssh://parabolagnulinux.org:1863/srv/git/abslibre

5 files changed, 44 insertions, 35 deletions

diff --git a/libre/mozilla-searchplugins/PKGBUILD b/libre/mozilla-searchplugins/PKGBUILD
index 0d1d14cd0..2405ac889 100644
--- a/libre/mozilla-searchplugins/PKGBUILD
+++ b/libre/mozilla-searchplugins/PKGBUILD
@@ -1,16 +1,16 @@
-# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net
+# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net>
 # Contributor: Figue <ffigue at gmail>
 # Contributor: Figue <ffigue at gmail>
 # Contributor (Parabola): fauno <fauno@kiwwwi.com.ar>
 # Contributor (Parabola): vando <facundo@esdebian.org>
-# Contributor (Parabola): Márcio Silva <coadde@adinet.com.uy>
+# Contributor (Parabola): Márcio Silva <coadde@lavabit.com>
 # Thank you very much to the older contributors:
 # Contributor: evr <evanroman at gmail>
 # Contributor: Muhammad 'MJ' Jassim <UnbreakableMJ@gmail.com> 
 
 pkgname=mozilla-searchplugins
-pkgver=1.3
-pkgrel=5
+pkgver=1.4
+pkgrel=2
 pkgdesc="System-wide OpenSearch plugins common for Mozilla based browsers."
 arch=('any')
 license=('MPL' 'GPL' 'LGPL')
@@ -19,20 +19,14 @@ source=(
   duckduckgo-html.xml
   duckduckgo-lite.xml
   internet-archive.xml
-  jamendo-en.xml.in
-  jamendo.ico::http://www.jamendo.com/favicon.ico
-  parabola-packages.xml
-  parabola-wiki-en.xml
+  parabola-packages.xml::https://parabolagnulinux.org/opensearch/packages/
+  parabola-wiki-en.xml::
   seeks-search.xml::http://www.seeks.fr/opensearch.xml
-  yacybluebox.xml::http://yacy.dyndns.org:8000/opensearchdescription.xml
+#  yacy.xml::http://search.ipredator.se/opensearchdescription.xml
+  yacy.xml
   wikipedia-en.xml::https://en.wikipedia.org/w/opensearch_desc.php
 )
 
-build() {
-  cd "$srcdir"
-  sed "s,@icon@,$(base64 -w0 < jamendo.ico)," < jamendo-en.xml.in > jamendo-en.xml
-}
-
 package() {
   install -m755 -d                "${pkgdir}/usr/lib/mozilla/searchplugins"
   install -m644 "${srcdir}"/*.xml "${pkgdir}/usr/lib/mozilla/searchplugins"
@@ -41,10 +35,8 @@ package() {
 md5sums=('b4cc6bd8353af36ade441916217619e4'
          '766aa6def4bf63c0d65afd6ca1b1ce37'
          '462c68585461f8cdc23c93c46f6ee4cf'
-         '0c9a3f48971aab8aa0cf2f5e2ff67292'
-         'e50a847cec81357e8730e0d327515a9c'
-         '8d486e7ae47f54c2d6555d96adbdd236'
-         '5bf9ca2558026fa3f4ec52d8e64fee47'
+         '92f834a3a1d85c9ae202955cdfe941eb'
+         'b9a0893d7f6d41d755c478fd60c44be8'
          'dc6c76acf4c68a40710383513d72fa8b'
-         'bdb2640c643493063051bc72eeeff920'
-         'cb281f07933210c812a6153f32109645')
+         '0f6cb4119f54e90d678827e2928474d4'
+         'dbdd9b61e89d73cc3a70cbe20a1160e1')
diff --git a/libre/mozilla-searchplugins/jamendo-en.xml.in b/libre/mozilla-searchplugins/jamendo-en.xml.in
deleted file mode 100644
index 96b3a008d..000000000
--- a/libre/mozilla-searchplugins/jamendo-en.xml.in
+++ /dev/null
@@ -1,10 +0,0 @@
-<SearchPlugin xmlns="http://www.mozilla.org/2006/browser/search/" xmlns:os="http://a9.com/-/spec/opensearch/1.1/">
-<os:ShortName>Jamendo (en)</os:ShortName>
-<os:Description>Search Jamendo.com English site for downloadable Creative Commons music</os:Description>
-<os:InputEncoding>UTF-8</os:InputEncoding>
-<os:Image width="16" height="16">data:image/x-icon;base64,@icon@</os:Image>
-<UpdateUrl>http://mycroft.mozdev.org/updateos.php/id0/jamendo.xml</UpdateUrl>
-<SearchForm>http://www.jamendo.com/en</SearchForm>
-<os:Url type="text/html" method="GET" template="http://www.jamendo.com/en/search#qs=q={searchTerms}">
-</os:Url>
-</SearchPlugin>
diff --git a/libre/mozilla-searchplugins/parabola-packages.xml b/libre/mozilla-searchplugins/parabola-packages.xml
index f746ad8f8..1cefb19da 100644
--- a/libre/mozilla-searchplugins/parabola-packages.xml
+++ b/libre/mozilla-searchplugins/parabola-packages.xml
@@ -2,7 +2,7 @@
 <os:ShortName>Parabola Packages</os:ShortName>
 <os:Description>Search the Parabola package repositories.</os:Description>
 <os:InputEncoding>UTF-8</os:InputEncoding>
-<os:Image width="16" height="16">data:image/x-icon;base64,AAABAAEAEBAAAAEAIABoBAAAFgAAACgAAAAQAAAAIAAAAAEAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8AihUrGP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AIcXLSJvFCcn////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8AbRIkcP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AGwTI0JWEBtB////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wCAAAACVQ8crP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AFYQHJI9ChRL////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wBlKzZHPQoUzgAAAAH///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8AknV8I0sdJv8kBgxU////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AMTExA1uTlX1JAYLyf///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wC5ubkLhG1x6CQGDP0PAAARzJmZBf///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8AxsbGCZB+g/QkBgz/DQMDUdu2tgfMn5koxo2NOsxmmQX///8A////AP///wD///8A////AP///wD///8A////AJ2JjX+NeX3/JAYM/wwCA5T///8A////AL+AgAi/foFfuG51l7JgaXCvY3E2/4CAAv///wD///8A////AJlveHOzqqv6UCUt/yQGDP8MAgTW////AP///wD///8A////AKqAgAawXmhnqk9b36VNW/KjT13mqGh16Kl+hvCbdHz/YyYx/z0KFP8kBgz/DAIE7f///wD///8A////AP///wD///8A////AJlmZgWkQU5inDFD0ZUhNv+FFyz/bRMk/1UPHP89ChT/JAYM/wwCA9v///8A////AP///wD///8A////AP///wD///8A////AP///wCTIDMohRYtfW0TJMBVDxzQPQoU3SUGDcoMBARA//8AAP//AAD//wAA//8AAP/3AAD/9wAA//sAAP/7AAD/+QAA//kAAP/5AAD/+AAA9/AAAPwAAAD/AAAA/+EAAA==</os:Image>
+<os:Image width="16" height="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAMAAAAoLQ9TAAAABGdBTUEAALGPC/xhBQAAACBjSFJNAAB6JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAAAtFBMVEUAAAB4fap4fKp4gK12fKh4fqt5eap4fqt4fqx4fat4faqAgKp3fap4fat4gKp4fKt4fat3e614fat4fatxcap3fKp4fat6fq14fax1fKx6eq13faoAAP93e6t4fat4fauAgKp6fqt5fqx3fap3d6p4fat3fqx5fqt4fat4fKt5fqp3fat4fatVVap4fat1fKh4fKt4fqp4fat4fax0dKJ4fauAgJ95fKx5gKx7e6p4fav///+r+nENAAAAOnRSTlMAbEIiKYgVgpD2ygZaziR9lz716AlvwkFiJRl4ATrzuQxDZS0P8UfL1KRjrcwD5iNGV6OZC8YIUCgbgnXDKgAAAAFiS0dEOzkO9GwAAAB4SURBVBjTY2DAAxiZGJiYYRwWVjZ2DgYmTi4wj5uHiZePX4BBUMhKGMgVERUTl5CUkpaRlbOykmdQUFRShuhSUbWyslJjEEEYqm5lpYFii6aVlRaKgLaVDjcyX1dPVR9FgYGVIapDjYxR+SamZqgC5hZoXrPE4WUAR5sJeNGfmtcAAAAldEVYdGRhdGU6Y3JlYXRlADIwMTMtMDgtMTVUMTE6MDg6MDItMDM6MDC3YtyCAAAAJXRFWHRkYXRlOm1vZGlmeQAyMDEzLTA4LTE1VDExOjA4OjAyLTAzOjAwxj9kPgAAAABJRU5ErkJggg==</os:Image>
 <os:Url type="text/html" method="GET" template="https://parabolagnulinux.org/packages/?q={searchTerms}">
 </os:Url><os:Url type="application/opensearchdescription+xml" method="GET" template="https://parabolagnulinux.org/opensearch/packages/" rel="self">
 </os:Url>
diff --git a/libre/mozilla-searchplugins/parabola-wiki-en.xml b/libre/mozilla-searchplugins/parabola-wiki-en.xml
index d218b21f8..a391d7335 100644
--- a/libre/mozilla-searchplugins/parabola-wiki-en.xml
+++ b/libre/mozilla-searchplugins/parabola-wiki-en.xml
@@ -1,11 +1,10 @@
 <SearchPlugin xmlns="http://www.mozilla.org/2006/browser/search/" xmlns:os="http://a9.com/-/spec/opensearch/1.1/">
-<os:ShortName>Parabola GNU/Linux-Libre Wiki (en)</os:ShortName>
+<os:ShortName>Parabola Wiki (en)</os:ShortName>
 <os:Description>Parabola GNU/Linux-Libre Wiki (en)</os:Description>
 <os:InputEncoding>UTF-8</os:InputEncoding>
-<os:Image width="16" height="16">data:image/x-icon;base64,AAABAAEAEBAAAAEAIABoBAAAFgAAACgAAAAQAAAAIAAAAAEAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8AihUrGP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AIcXLSJvFCcn////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8AbRIkcP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AGwTI0JWEBtB////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wCAAAACVQ8crP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AFYQHJI9ChRL////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wBlKzZHPQoUzgAAAAH///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8AknV8I0sdJv8kBgxU////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AMTExA1uTlX1JAYLyf///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wC5ubkLhG1x6CQGDP0PAAARzJmZBf///wD///8A////AP///wD///
-8A////AP///wD///8A////AP///wD///8AxsbGCZB+g/QkBgz/DQMDUdu2tgfMn5koxo2NOsxmmQX///8A////AP///wD///8A////AP///wD///8A////AJ2JjX+NeX3/JAYM/wwCA5T///8A////AL+AgAi/foFfuG51l7JgaXCvY3E2/4CAAv///wD///8A////AJlveHOzqqv6UCUt/yQGDP8MAgTW////AP///wD///8A////AKqAgAawXmhnqk9b36VNW/KjT13mqGh16Kl+hvCbdHz/YyYx/z0KFP8kBgz/DAIE7f///wD///8A////AP///wD///8A////AJlmZgWkQU5inDFD0ZUhNv+FFyz/bRMk/1UPHP89ChT/JAYM/wwCA9v///8A////AP///wD///8A////AP///wD///8A////AP///wCTIDMohRYtfW0TJMBVDxzQPQoU3SUGDcoMBARA//8AAP//AAD//wAA//8AAP/3AAD/9wAA//sAAP/7AAD/+QAA//kAAP/5AAD/+AAA9/AAAPwAAAD/AAAA/+EAAA==</os:Image>
+<os:Image width="16" height="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAMAAAAoLQ9TAAAABGdBTUEAALGPC/xhBQAAACBjSFJNAAB6JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAAAtFBMVEUAAAB4fap4fKp4gK12fKh4fqt5eap4fqt4fqx4fat4faqAgKp3fap4fat4gKp4fKt4fat3e614fat4fatxcap3fKp4fat6fq14fax1fKx6eq13faoAAP93e6t4fat4fauAgKp6fqt5fqx3fap3d6p4fat3fqx5fqt4fat4fKt5fqp3fat4fatVVap4fat1fKh4fKt4fqp4fat4fax0dKJ4fauAgJ95fKx5gKx7e6p4fav///+r+nENAAAAOnRSTlMAbEIiKYgVgpD2ygZaziR9lz716AlvwkFiJRl4ATrzuQxDZS0P8UfL1KRjrcwD5iNGV6OZC8YIUCgbgnXDKgAAAAFiS0dEOzkO9GwAAAB4SURBVBjTY2DAAxiZGJiYYRwWVjZ2DgYmTi4wj5uHiZePX4BBUMhKGMgVERUTl5CUkpaRlbOykmdQUFRShuhSUbWyslJjEEEYqm5lpYFii6aVlRaKgLaVDjcyX1dPVR9FgYGVIapDjYxR+SamZqgC5hZoXrPE4WUAR5sJeNGfmtcAAAAldEVYdGRhdGU6Y3JlYXRlADIwMTMtMDgtMTVUMTE6MDg6MDItMDM6MDC3YtyCAAAAJXRFWHRkYXRlOm1vZGlmeQAyMDEzLTA4LTE1VDExOjA4OjAyLTAzOjAwxj9kPgAAAABJRU5ErkJggg==</os:Image>
 <SearchForm>https://wiki.parabolagnulinux.org/Special:Search</SearchForm>
 <os:Url type="text/html" method="GET" template="https://wiki.parabolagnulinux.org/index.php?title=Special:Search&amp;search={searchTerms}">
 </os:Url><os:Url type="application/x-suggestions+json" method="GET" template="https://wiki.parabolagnulinux.org/api.php?action=opensearch&amp;search={searchTerms}&amp;namespace=0">
 </os:Url>
-</SearchPlugin>
\ No newline at end of file
+</SearchPlugin>
diff --git a/libre/mozilla-searchplugins/yacy.xml b/libre/mozilla-searchplugins/yacy.xml
new file mode 100644
index 000000000..9c97f16cc
--- /dev/null
+++ b/libre/mozilla-searchplugins/yacy.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<OpenSearchDescription
+    xmlns="http://a9.com/-/spec/opensearch/1.1/"
+    xmlns:suggestions="http://www.opensearch.org/specifications/opensearch/extensions/suggestions/1.1">
+  <ShortName>YaCy</ShortName>
+  <LongName>YaCy.net - P2P Web Search</LongName>
+  <Image type="image/gif">http://search.ipredator.se/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>
+  <OutputEncoding>UTF-8</OutputEncoding>
+  <InputEncoding>UTF-8</InputEncoding>
+  <AdultContent>true</AdultContent>
+  <Description>YaCy is an open-source 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 '_anonufe-29422893-0'.</Description>
+  
+  <Url type="text/html" method="GET" template="http://search.ipredator.se/yacysearch.html?query={searchTerms}&amp;startRecord={startIndex?}&amp;maximumRecords={count?}&amp;nav=all" />
+  <Url type="application/rss+xml" method="GET" template="http://search.ipredator.se/yacysearch.rss?nav=&amp;query={searchTerms}&amp;startRecord={startIndex?}&amp;maximumRecords={count?}&amp;verify=false" />
+  
+  <Url type="application/x-suggestions+json" template="http://search.ipredator.se/suggest.json?query={searchTerms}"/>
+  <Url type="application/x-suggestions+xml" template="http://search.ipredator.se/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 https://gitorious.org/+yacy-developers</Developer>
+  <Query role="example" searchTerms="yacy+open+source" />
+  <Tags>YaCy Open Source P2P Web Search</Tags>
+  <Contact>See http://search.ipredator.se/ViewProfile.html?hash=localhash</Contact>
+  <Attribution>YaCy Software &amp;copy; 2004-2012 by Michael Christen et al., YaCy.net; Content: ask peer owner</Attribution>
+  <SyndicationRight>open</SyndicationRight>
+</OpenSearchDescription>