From 8298bee7828000bf1ab55304695872472883ab65 Mon Sep 17 00:00:00 2001
From: aurelien
Date: Thu, 22 Nov 2012 18:56:54 +0100
Subject: + facter puppet ruby-hiera-json ruby-hiera ruby-shadow
---
pcr/facter/PKGBUILD | 30 ++++++++++++++++
pcr/puppet/PKGBUILD | 86 ++++++++++++++++++++++++++++++++++++++++++++
pcr/puppet/fileserver.conf | 12 +++++++
pcr/puppet/puppet | 45 +++++++++++++++++++++++
pcr/puppet/puppet.conf | 32 +++++++++++++++++
pcr/puppet/puppet.install | 46 ++++++++++++++++++++++++
pcr/puppet/puppetmaster | 45 +++++++++++++++++++++++
pcr/ruby-hiera-json/PKGBUILD | 26 ++++++++++++++
pcr/ruby-hiera/PKGBUILD | 34 ++++++++++++++++++
pcr/ruby-hiera/hiera.yaml | 21 +++++++++++
pcr/ruby-shadow/PKGBUILD | 24 +++++++++++++
11 files changed, 401 insertions(+)
create mode 100644 pcr/facter/PKGBUILD
create mode 100644 pcr/puppet/PKGBUILD
create mode 100644 pcr/puppet/fileserver.conf
create mode 100755 pcr/puppet/puppet
create mode 100644 pcr/puppet/puppet.conf
create mode 100644 pcr/puppet/puppet.install
create mode 100755 pcr/puppet/puppetmaster
create mode 100644 pcr/ruby-hiera-json/PKGBUILD
create mode 100644 pcr/ruby-hiera/PKGBUILD
create mode 100644 pcr/ruby-hiera/hiera.yaml
create mode 100644 pcr/ruby-shadow/PKGBUILD
diff --git a/pcr/facter/PKGBUILD b/pcr/facter/PKGBUILD
new file mode 100644
index 000000000..956569001
--- /dev/null
+++ b/pcr/facter/PKGBUILD
@@ -0,0 +1,30 @@
+# Contributor: Greg Sutcliffe
+# Contributor: Hyacinthe Cartiaux
+# Contributor: Thomas S Hatch
+# Contributor: Dave Simons
+# Maintainer : Parabola GNU / Linux-libre Aurelien Desbrieres
+
+pkgname=facter
+pkgver=1.6.14
+pkgrel=1
+pkgdesc="A library for collecting facts about your system."
+arch=("any")
+url="http://puppetlabs.com/projects/facter/"
+license=("APACHE")
+depends=("ruby" "inetutils" "net-tools")
+options=(!emptydirs)
+source=(http://puppetlabs.com/downloads/facter/facter-$pkgver.tar.gz)
+md5sums=('b6c3df8ad1781c10d30785c58a4504ef')
+
+package() {
+ cd $srcdir/facter-$pkgver
+
+ ruby ./install.rb \
+ --destdir=$pkgdir \
+ --bindir=/usr/bin \
+ --sbindir=/usr/sbin
+
+ install -d -m755 "${pkgdir}/usr/share/licenses/${pkgname}"
+ install -m 644 "LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+
+}
diff --git a/pcr/puppet/PKGBUILD b/pcr/puppet/PKGBUILD
new file mode 100644
index 000000000..02e8f32c8
--- /dev/null
+++ b/pcr/puppet/PKGBUILD
@@ -0,0 +1,86 @@
+# Puppet: Installer: Arch
+# Contributor: Greg Sutcliffe
+# Contributor: Hyacinthe Cartiaux
+# Contributor: Thomas S Hatch
+# Contributor: Xavion
+# Contributor: Miah Johnson
+# Contributor: Dave Simons
+# Contributor: Niels Abspoel
+# Maintainer : Parabola GNU / Linux-libre Aurelien Desbrieres
+
+# RC style, reserved for later use
+#pkgname=puppet
+#_rc=8
+#_pkgver=3.0.0
+#pkgver=${_pkgver}_rc${_rc}
+
+pkgname=puppet
+pkgver=3.0.1
+pkgrel=5
+pkgdesc="A system for automating system administration tasks."
+arch=("any")
+url="http://puppetlabs.com/projects/puppet/"
+license=("APACHE")
+depends=("ruby" "ruby-shadow" "facter" "ruby-hiera" "ruby-hiera-json")
+makedepends=('which')
+backup=("etc/puppet/puppet.conf")
+options=(emptydirs)
+provides=("puppet" "vim-puppet" "ruby-hiera-puppet")
+conflicts=("puppet3" "ruby-puppet" "vim-puppet" "ruby-hiera-puppet")
+install="puppet.install"
+source=(http://puppetlabs.com/downloads/puppet/puppet-${pkgver//_/-}.tar.gz
+ fileserver.conf
+ puppet
+ puppet.conf
+ puppetmaster)
+md5sums=('2117e3a1964ac54fcd36d926eed3db94'
+ 'ffacd9bfb9c7656a3a345dbc5eb0e67a'
+ '59dbf39e251bc4877e7604a5876c642d'
+ 'a7d61d20e46b411eb50ad5279987584a'
+ '4c507c580cb28d7a5adc9ea6b3626657')
+
+package() {
+ cd $srcdir/puppet-${pkgver//_/-}
+
+ # Install
+ ruby ./install.rb \
+ --destdir=$pkgdir \
+ --bindir=/usr/bin \
+ --sbindir=/usr/sbin \
+ --mandir=/usr/share/man
+
+
+ # Set up vim and emacs
+ install -Dp -m0644 ext/vim/ftdetect/puppet.vim $pkgdir/usr/share/vim/vimfiles/ftdetect/puppet.vim
+ install -Dp -m0644 ext/vim/syntax/puppet.vim $pkgdir/usr/share/vim/vimfiles/syntax/puppet.vim
+ install -Dp -m0644 ext/emacs/puppet-mode.el $pkgdir/usr/share/emacs/site-lisp/puppet-mode.el
+ install -Dp -m0644 ext/emacs/puppet-mode-init.el $pkgdir/usr/share/emacs/site-lisp/site-start.d/puppet-mode-init.el
+
+ # Configuration and rc scripts
+ install -d $pkgdir/etc/{puppet,rc.d}
+ install -m 644 $srcdir/puppet.conf $pkgdir/etc/puppet/puppet.conf
+ install -m 644 $srcdir/fileserver.conf $pkgdir/etc/puppet/fileserver.conf
+
+ # Setup tmpfiles.d config
+ install -d $pkgdir/etc/tmpfiles.d
+ echo "D /var/run/puppet 0755 puppet puppet -" > $pkgdir/etc/tmpfiles.d/puppet.conf
+
+ # Configuration for hiera / symlink is there to use hiera within puppet.
+ ln -snf /etc/hiera.yaml ${pkgdir}/etc/puppet/hiera.yaml
+
+ # Systemd files
+ install -Dm 644 $srcdir/puppet-${pkgver//_/-}/ext/systemd/puppetagent.service $pkgdir/usr/lib/systemd/system/puppetagent.service
+ install -Dm 644 $srcdir/puppet-${pkgver//_/-}/ext/systemd/puppetmaster.service $pkgdir/usr/lib/systemd/system/puppetmaster.service
+
+ # Create puppet homedir and hieradir
+ install -d $pkgdir/var/lib/puppet
+ install -d $pkgdir/var/lib/hiera
+
+ install -D $srcdir/puppet $pkgdir/etc/rc.d/puppet
+ install -D $srcdir/puppetmaster $pkgdir/etc/rc.d/puppetmaster
+
+ # Copy the LICENSE file in the usual directory
+ install -d -m755 "${pkgdir}/usr/share/licenses/${pkgname}"
+ install -m 644 "LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+
+}
diff --git a/pcr/puppet/fileserver.conf b/pcr/puppet/fileserver.conf
new file mode 100644
index 000000000..67e387ca0
--- /dev/null
+++ b/pcr/puppet/fileserver.conf
@@ -0,0 +1,12 @@
+# This file consists of arbitrarily named sections/modules
+# defining where files are served from and to whom
+
+# Define a section 'files'
+# Adapt the allow/deny settings to your needs. Order
+# for allow/deny does not matter, allow always takes precedence
+# over deny
+# [files]
+# path /var/lib/puppet/files
+# allow *.example.com
+# deny *.evil.example.com
+# allow 192.168.0.0/24
diff --git a/pcr/puppet/puppet b/pcr/puppet/puppet
new file mode 100755
index 000000000..4126be850
--- /dev/null
+++ b/pcr/puppet/puppet
@@ -0,0 +1,45 @@
+#!/bin/bash
+DAEMON=$(type -p puppetd)
+
+. /etc/rc.conf
+. /etc/rc.d/functions
+[ -f /etc/conf.d/puppet ] && . /etc/conf.d/puppet
+
+PID=$(pidof -xo %PPID $DAEMON)
+case "$1" in
+ start)
+ stat_busy "Starting Puppet Daemon"
+ if [ -z "$PID" ]; then
+ [ -f /var/run/puppet.pid ] && rm -f /var/run/puppet.pid
+ $DAEMON $PUPPETD_ARGS
+ fi
+ if [ ! -z "$PID" -o $? -gt 0 ]; then
+ stat_fail
+ else
+ PID=$(pidof -xo %PPID $DAEMON)
+ echo $PID > /var/run/puppet.pid
+ add_daemon puppet
+ stat_done
+ fi
+ ;;
+ stop)
+ stat_busy "Stopping Puppet Daemon"
+ [ ! -z "$PID" ] && kill $PID &> /dev/null
+ if [ $? -gt 0 ]; then
+ stat_fail
+ else
+ rm_daemon puppet
+ rm -f /var/run/puppet.pid
+ stat_done
+ fi
+ ;;
+ restart)
+ $0 stop
+ if [ ! -z $PID ]; then
+ while ps -p $PID > /dev/null; do sleep 1; done
+ fi
+ $0 start
+ ;;
+ *)
+ echo "usage: $0 {start|stop|restart}"
+esac
diff --git a/pcr/puppet/puppet.conf b/pcr/puppet/puppet.conf
new file mode 100644
index 000000000..aa5868dee
--- /dev/null
+++ b/pcr/puppet/puppet.conf
@@ -0,0 +1,32 @@
+[main]
+ # The Puppet var directory
+ # The default value is '/var/lib/puppet'
+ vardir = /var/lib/puppet
+
+ # The Puppet log directory.
+ # The default value is '$vardir/log'.
+ logdir = /var/log/puppet
+
+ # Where Puppet PID files are kept.
+ # The default value is '$vardir/run'.
+ rundir = /var/run/puppet
+
+ # Where SSL certificates are kept.
+ # The default value is '$confdir/ssl'.
+ pluginsync=true
+
+
+[agent]
+ # The file in which puppetd stores a list of the classes
+ # associated with the retrieved configuratiion. Can be loaded in
+ # the separate ``puppet`` executable using the ``--loadclasses``
+ # option.
+ # The default value is '$confdir/classes.txt'.
+ classfile = $vardir/classes.txt
+
+ # Where puppetd caches the local configuration. An
+ # extension indicating the cache format is added automatically.
+ # The default value is '$confdir/localconfig'.
+ localconfig = $vardir/localconfig
+
+#[master]
diff --git a/pcr/puppet/puppet.install b/pcr/puppet/puppet.install
new file mode 100644
index 000000000..928df566b
--- /dev/null
+++ b/pcr/puppet/puppet.install
@@ -0,0 +1,46 @@
+# Puppet: Installer: Arch
+# Maintainer: Thomas S Hatch
+# Contributor: Xavion
+# Contributor: Miah Johnson
+
+pre_install() {
+ getent group puppet &>/dev/null || groupadd -r puppet -g 52 &>/dev/null
+ getent passwd puppet &>/dev/null || useradd -r -u 52 -g puppet -d /var/lib/puppet -s /sbin/nologin -c "Puppet" puppet &>/dev/null || :
+}
+
+pre_upgrade() {
+ pre_install
+ usermod -d /var/lib/puppet puppet &>/dev/null || :
+}
+
+post_install() {
+ :
+}
+
+pre_remove() {
+if [ -f /var/run/puppetmasterd.pid ]; then
+ PIDOF=$(pidof -xo %PPID puppetmasterd)
+ PIDFILE=$(cat /var/run/puppetmasterd.pid)
+ if [ $PIDOF -eq $PIDFILE ]; then
+ /etc/rc.d/puppetmaster stop
+ fi
+fi
+
+if [ -f /var/run/puppetd.pid ]; then
+ PIDOF=$(pidof -xo %PPID puppetd)
+ PIDFILE=$(cat /var/run/puppetd.pid)
+ if [ $PIDOF -eq $PIDFILE ]; then
+ /etc/rc.d/puppet stop
+ fi
+fi
+}
+
+post_remove() {
+ # Remove user and group
+ userdel puppet
+}
+
+op=$1
+shift
+
+$op "$@"
diff --git a/pcr/puppet/puppetmaster b/pcr/puppet/puppetmaster
new file mode 100755
index 000000000..8b3971053
--- /dev/null
+++ b/pcr/puppet/puppetmaster
@@ -0,0 +1,45 @@
+#!/bin/bash
+DAEMON=$(type -p puppetmasterd)
+
+. /etc/rc.conf
+. /etc/rc.d/functions
+[ -f /etc/conf.d/puppetmaster ] && . /etc/conf.d/puppetmaster
+
+PID=$(pidof -xo %PPID $DAEMON)
+case "$1" in
+ start)
+ stat_busy "Starting Puppet Master Daemon"
+ if [ -z "$PID" ]; then
+ [ -f /var/run/puppetmaster.pid ] && rm -f /var/run/puppetmaster.pid
+ $DAEMON $PUPPETMASTER_ARGS
+ fi
+ if [ ! -z "$PID" -o $? -gt 0 ]; then
+ stat_fail
+ else
+ PID=$(pidof -xo %PPID $DAEMON)
+ echo $PID > /var/run/puppetmaster.pid
+ add_daemon puppetmaster
+ stat_done
+ fi
+ ;;
+ stop)
+ stat_busy "Stopping Puppet Master Daemon"
+ [ ! -z "$PID" ] && kill $PID &> /dev/null
+ if [ $? -gt 0 ]; then
+ stat_fail
+ else
+ rm_daemon puppetmaster
+ rm -f /var/run/puppetmaster.pid
+ stat_done
+ fi
+ ;;
+ restart)
+ $0 stop
+ if [ ! -z $PID ]; then
+ while ps -p $PID > /dev/null; do sleep 1; done
+ fi
+ $0 start
+ ;;
+ *)
+ echo "usage: $0 {start|stop|restart}"
+esac
diff --git a/pcr/ruby-hiera-json/PKGBUILD b/pcr/ruby-hiera-json/PKGBUILD
new file mode 100644
index 000000000..4d80244c8
--- /dev/null
+++ b/pcr/ruby-hiera-json/PKGBUILD
@@ -0,0 +1,26 @@
+# Contributor: Jochen Schalanda
+# Maintainer : Parabola GNU / Linux-libre Aurelien Desbrieres
+
+_gemname=hiera-json
+pkgname=ruby-$_gemname
+pkgver=0.4.0
+pkgrel=1
+pkgdesc='Store Hiera data in JSON'
+arch=(any)
+url='http://projects.puppetlabs.com/projects/hiera/'
+license=('MIT')
+depends=('ruby')
+makedepends=('rubygems' 'ruby-hiera')
+source=(http://gems.rubyforge.org/gems/$_gemname-$pkgver.gem)
+noextract=($_gemname-$pkgver.gem)
+
+package() {
+ cd "$srcdir"
+ # _gemdir is defined inside package() because if ruby[gems] is not installed on
+ # the system, makepkg will exit with an error when sourcing the PKGBUILD.
+ local _gemdir="$(ruby -rubygems -e'puts Gem.default_dir')"
+
+ gem install --no-user-install --ignore-dependencies -i "$pkgdir$_gemdir" \
+ -n "$pkgdir/usr/bin" "$_gemname-$pkgver.gem"
+}
+
diff --git a/pcr/ruby-hiera/PKGBUILD b/pcr/ruby-hiera/PKGBUILD
new file mode 100644
index 000000000..c4d51fe44
--- /dev/null
+++ b/pcr/ruby-hiera/PKGBUILD
@@ -0,0 +1,34 @@
+# Contributor: Jochen Schalanda
+# Maintainer : Parabola GNU / Linux-libre Aurelien Desbrieres
+
+_gemname=hiera
+pkgname=ruby-$_gemname
+pkgver=1.1.1
+pkgrel=1
+pkgdesc="A pluggable data store for hierarcical data."
+arch=(any)
+url='http://projects.puppetlabs.com/projects/hiera/'
+license=('MIT')
+depends=('ruby')
+makedepends=('rubygems')
+source=(
+ "http://gems.rubyforge.org/gems/$_gemname-$pkgver.gem"
+ 'hiera.yaml')
+noextract=($_gemname-$pkgver.gem)
+
+package() {
+ cd "$srcdir"
+ # _gemdir is defined inside package() because if ruby[gems] is not installed on
+ # the system, makepkg will exit with an error when sourcing the PKGBUILD.
+ local _gemdir="$(ruby -rubygems -e'puts Gem.default_dir')"
+
+ gem install --no-user-install --ignore-dependencies -i "$pkgdir$_gemdir" \
+ -n "$pkgdir/usr/bin" "$_gemname-$pkgver.gem"
+
+ # Create hiera default directory
+ install -d $pkgdir/var/lib/hiera
+
+ # Create hiera default configuration
+ install -d $pkgdir/etc
+ install -m 644 $srcdir/hiera.yaml $pkgdir/etc/
+}
diff --git a/pcr/ruby-hiera/hiera.yaml b/pcr/ruby-hiera/hiera.yaml
new file mode 100644
index 000000000..cd0be3fec
--- /dev/null
+++ b/pcr/ruby-hiera/hiera.yaml
@@ -0,0 +1,21 @@
+---
+:backend:
+ - yaml
+ - json
+:hierarchy:
+ - defaults
+ - global
+
+:yaml:
+# datadir is empty here, so hiera uses its defaults:
+# - /var/lib/hiera on *nix
+# - %CommonAppData%\PuppetLabs\hiera\var on Windows
+# When specifying a datadir, make sure the directory exists.
+ :datadir:
+
+:json:
+# datadir is empty here, so hiera uses its defaults:
+# - /var/lib/hiera on *nix
+# - %CommonAppData%\PuppetLabs\hiera\var on Windows
+# When specifying a datadir, make sure the directory exists.
+ :datadir:
diff --git a/pcr/ruby-shadow/PKGBUILD b/pcr/ruby-shadow/PKGBUILD
new file mode 100644
index 000000000..5b7ee1972
--- /dev/null
+++ b/pcr/ruby-shadow/PKGBUILD
@@ -0,0 +1,24 @@
+# Contributor: Thomas S Hatch
+# Maintainer : Parabola GNU / Linux-libre Aurelien Desbrieres
+
+pkgname=ruby-shadow
+pkgver=2.1.4
+pkgrel=5
+pkgdesc="Interface for shadow passwords for Ruby"
+arch=(i686 x86_64 arm)
+depends=('ruby')
+license=('publicdomain')
+url=('https://github.com/apalmblad/ruby-shadow.git')
+source=("https://github.com/apalmblad/ruby-shadow/archive/$pkgver.tar.gz")
+
+
+build() {
+ cd $srcdir/$pkgname-$pkgver
+ ruby extconf.rb
+ make
+}
+
+package() {
+ cd $srcdir/$pkgname-$pkgver
+ make DESTDIR=$pkgdir install
+}
--
cgit v1.2.3-54-g00ecf
From 63a8b55a5ead3ad152f851e14e6d5ea815459611 Mon Sep 17 00:00:00 2001
From: aurelien
Date: Thu, 22 Nov 2012 21:09:55 +0100
Subject: aurelien
---
~aurelien/aurelien | 7 +++++++
1 file changed, 7 insertions(+)
create mode 100644 ~aurelien/aurelien
diff --git a/~aurelien/aurelien b/~aurelien/aurelien
new file mode 100644
index 000000000..2ed67f701
--- /dev/null
+++ b/~aurelien/aurelien
@@ -0,0 +1,7 @@
+Hi!
+
+I am or was aurelien.
+
+An happy free thinker that have find his way in Parabola!
+
+Have fun & be free!
\ No newline at end of file
--
cgit v1.2.3-54-g00ecf
From e61f24169547faea84a6b813212bac030feaacd1 Mon Sep 17 00:00:00 2001
From: aurelien
Date: Thu, 22 Nov 2012 21:14:03 +0100
Subject: aurelien
---
~aurelien/aurelien | 12 ++++++++++++
1 file changed, 12 insertions(+)
diff --git a/~aurelien/aurelien b/~aurelien/aurelien
index 2ed67f701..3bda9d20a 100644
--- a/~aurelien/aurelien
+++ b/~aurelien/aurelien
@@ -4,4 +4,16 @@ I am or was aurelien.
An happy free thinker that have find his way in Parabola!
+All the packages i had build are in pcr, why pcr?
+Because Parabola Community Repository
+
+And so that community need from my point of view to offer
+cool software to offer cool ways.
+
+All the packages have build are free as in freedom, so,
+you are free to build them too, to get care of them.
+
+PKGBUILDs are great way to discover Parabola, BASH and much
+more.
+
Have fun & be free!
\ No newline at end of file
--
cgit v1.2.3-54-g00ecf
From e0755bc7fa7cd05b992a9988a9d38587e169f42d Mon Sep 17 00:00:00 2001
From: André Fabian Silva Delgado
Date: Fri, 23 Nov 2012 15:59:39 -0200
Subject: iceape-libre-2.7.11.1-1: updating version
---
libre/iceape-libre/PKGBUILD | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/libre/iceape-libre/PKGBUILD b/libre/iceape-libre/PKGBUILD
index eedd8f584..2247f0a8a 100755
--- a/libre/iceape-libre/PKGBUILD
+++ b/libre/iceape-libre/PKGBUILD
@@ -3,7 +3,7 @@
# We're getting this from Debian Sid
_debname=iceape
-_debver=2.7.10
+_debver=2.7.11
_debrel=1
_debrepo=http://ftp.debian.org/debian/pool/main/
debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; }
@@ -29,8 +29,8 @@ source=("${_debrepo}/`debfile ${_debname}`_${_debver}.orig.tar.bz2"
${_pkgname}-2.0-lang.patch
clrf.patch
libre.patch)
-md5sums=('63596601fd01000c842d9543ea8dfd56'
- 'f8de6b9e1906c8349e8799f819503897'
+md5sums=('40473b4c662975eda865e1fc35c4953b'
+ 'f704b69cc0328c83edd6223420fbd412'
'60ba9e8f2fafd20e41268af534a55ea7'
'7266333e31731af8bb50c2eca8d0bd26'
'25b6fe16ac24cd5c852213e5c1adb272'
--
cgit v1.2.3-54-g00ecf
From 0c07410fac8743635f35aadb6150e36078bbc155 Mon Sep 17 00:00:00 2001
From: André Fabian Silva Delgado
Date: Fri, 23 Nov 2012 17:00:55 -0200
Subject: iceape-i18n-2.7.11.1-1: updating version
---
libre/iceape-i18n/PKGBUILD | 50 +++++++++++++++++++++++-----------------------
1 file changed, 25 insertions(+), 25 deletions(-)
diff --git a/libre/iceape-i18n/PKGBUILD b/libre/iceape-i18n/PKGBUILD
index 6aaa1aa04..cc9691a7c 100755
--- a/libre/iceape-i18n/PKGBUILD
+++ b/libre/iceape-i18n/PKGBUILD
@@ -11,7 +11,7 @@
# - Run 'make'. It will take care of everything else for you.
_debname=iceape
-_debver=2.7.10
+_debver=2.7.11
_debrel=1
_debrepo=http://ftp.debian.org/debian/pool/main/
debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; }
@@ -22,7 +22,7 @@ pkgbase=iceape-i18n
pkgname=($(for lang in ${_langpacks[@]}
do echo $pkgbase-$lang | tr A-Z a-z
done))
-_pkgver=2.7.10
+_pkgver=2.7.11
pkgver=${_debver}.${_debrel}
pkgrel=1
@@ -58,26 +58,26 @@ package_iceape-i18n-$(echo $lang | tr A-Z a-z)() {
"
done
-md5sums=('6499aa420d5fa855a3884c657066c443'
- 'c4b98806b5a6cce75878bdf0668f5a4a'
- 'ac1a19ed29bda42f66e533ca9ee79fac'
- '6116bd1b7c51d9414c68e1807d264f35'
- '621dc719068050b479ad0fb9060d39e6'
- 'b184194c4e69dc00ee9f3b15dee71d92'
- '84058513ab8884d0f279aa2990c10327'
- '5be7810ca391eb31d26f5ab46c2f8fea'
- '58737d11a2c0852d6701549d22f071b6'
- 'ac5994cd318ca2692823f91908eee101'
- '5a07c756674b24b0b33af1e26a8e59ee'
- '9178d335fa9f998f157a2e7f27384b15'
- '2e40229a1ef5386574d98b243260f266'
- 'ff8c27d6afc9911af03737c23a0eae5d'
- '611702c6dd5638154ff8a5c99e909da0'
- '217fd6fd1e46eefb524457566f124074'
- '09bb4d6d36403f97b923625055767884'
- 'cebd80d880c87862d9a8baf97c3c5b7b'
- '023750f204d9f0ac89c62987b41532f4'
- '0d753213210d92a8f751b3221fe34dad'
- '4b180802effa63316c54e5ec904405c7'
- '8be48ada576dfd9a37e6b3c0bc55c298'
- 'af08b7f96b175c560bba71ab59e1a3dc')
+md5sums=('fb27360aff6250e7d483803583a5cd78'
+ '236c7aacd7e6416a37aff95f7bfa6a80'
+ 'f17d76128ab529415078cafe63b61d50'
+ '07a5c72158427db8c5a990be6eb2d036'
+ 'fddbcf27d00f1f4d92fed197ace8dd1b'
+ '96eb3291200c44ffdc3ab1d1446f00b7'
+ '04dec3bee388ae66cd434342ab03074f'
+ 'bdef8b38501e7d6805b5304ef2bf8425'
+ '90b5d0ab0ab2eb3b75e5f80cb6d289bb'
+ '97f940c39b84a90b0e16eaeca4fa7806'
+ '34644b44381ae1da46f2fa308fd1cf34'
+ 'a6240664344798568276dd5dbdd27fb2'
+ '61aedef6a89b400584dde82b5e97ff0f'
+ 'abe7a9172876b30c4677b1f4c2237fc9'
+ '60f3c543fbdb72cc12aef8f2369101ff'
+ 'c002da281c0d0fa357f92edd2b8cd12c'
+ 'c17ab30f25f05024879afdf85fa4c516'
+ '250a08a999d6d1d6086ffbd17d60fbb4'
+ '609ce8793ea0d5465da7195e4d956fef'
+ '060226599bac5bc8ddb64417ef1a0108'
+ 'eaa827909690bfa8dfdc621164e23ca8'
+ '3fb66893b5ea3b959de48ef16fb26c74'
+ '6f2d77e767efa0b0d4cb56df9ccd0a2f')
\ No newline at end of file
--
cgit v1.2.3-54-g00ecf
From 64a05323414587c97e5df9e5b0d7b2ad110bbdc0 Mon Sep 17 00:00:00 2001
From: André Fabian Silva Delgado
Date: Fri, 23 Nov 2012 17:30:24 -0200
Subject: iceape-i18n-2.7.11.1-1: adding a new line at the end of PKGBUILD file
---
libre/iceape-i18n/PKGBUILD | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/libre/iceape-i18n/PKGBUILD b/libre/iceape-i18n/PKGBUILD
index cc9691a7c..815f0e340 100755
--- a/libre/iceape-i18n/PKGBUILD
+++ b/libre/iceape-i18n/PKGBUILD
@@ -80,4 +80,4 @@ md5sums=('fb27360aff6250e7d483803583a5cd78'
'060226599bac5bc8ddb64417ef1a0108'
'eaa827909690bfa8dfdc621164e23ca8'
'3fb66893b5ea3b959de48ef16fb26c74'
- '6f2d77e767efa0b0d4cb56df9ccd0a2f')
\ No newline at end of file
+ '6f2d77e767efa0b0d4cb56df9ccd0a2f')
--
cgit v1.2.3-54-g00ecf
From 8ed2d882aebb0e57c7ffab6162ab7ce125d981c7 Mon Sep 17 00:00:00 2001
From: André Fabian Silva Delgado
Date: Fri, 23 Nov 2012 22:41:43 -0200
Subject: removing linux-libre-pax-flags, new package replacement is paxutils
---
kernels/linux-libre-pax-flags/PKGBUILD | 27 ----
kernels/linux-libre-pax-flags/linux-pax-flags | 174 --------------------------
2 files changed, 201 deletions(-)
delete mode 100644 kernels/linux-libre-pax-flags/PKGBUILD
delete mode 100755 kernels/linux-libre-pax-flags/linux-pax-flags
diff --git a/kernels/linux-libre-pax-flags/PKGBUILD b/kernels/linux-libre-pax-flags/PKGBUILD
deleted file mode 100644
index 102f5ee74..000000000
--- a/kernels/linux-libre-pax-flags/PKGBUILD
+++ /dev/null
@@ -1,27 +0,0 @@
-# Contributors:
-# henning mueller
-# Maintainer (Parabola): André Silva
-# Maintainer (Parabola): Márcio Silva
-
-_pkgname=linux-pax-flags
-pkgname=linux-libre-pax-flags
-pkgdesc='Deactivates PaX flags for several libre binaries to work with PaX enabled kernels'
-pkgver=1.0.26
-pkgrel=1
-arch=(any)
-url='https://projects.parabolagnulinux.org/abslibre.git/tree/kernels/linux-libre-pax-flags/'
-license=(GPL2)
-depends=(bash paxctl)
-replaces=('linux-pax-flags')
-conflicts=('linux-pax-flags')
-provides=("linux-pax-flags=$pkgver")
-source=($_pkgname)
-sha256sums=(bf1fda4919e7ed8052711c91933d9da5d86945ba44133c94e1952dedb4d1759b)
-
-build() {
- return 0
-}
-
-package() {
- install -D -m755 $srcdir/$_pkgname $pkgdir/usr/bin/$_pkgname
-}
diff --git a/kernels/linux-libre-pax-flags/linux-pax-flags b/kernels/linux-libre-pax-flags/linux-pax-flags
deleted file mode 100755
index 22f5a8171..000000000
--- a/kernels/linux-libre-pax-flags/linux-pax-flags
+++ /dev/null
@@ -1,174 +0,0 @@
-#!/bin/bash
-
-[ "$UID" = "0" ] || {
- sudo $0
- exit $!
-}
-
-function homedir() {
- egrep ^$1 /etc/passwd | cut -d: -f 6
-}
-
-declare -A perms
-
-perms=(
- # RANDMMAP off
- ['cPSMXEr']='
- /usr/bin/grub-script-check
- '
- # MPROTECT and RANDMMAP off
- ['cPSmXEr']='
- /usr/bin/elinks
- /usr/bin/pyrogenesis
- /usr/lib/iceweasel/iceweasel
- /usr/lib/iceweasel/plugin-container
- /usr/lib/icecat/icecat
- /usr/lib/icecat/plugin-container
- /usr/lib/polkit-1/polkitd
- /usr/lib/icedove/icedove
- '
- # SEGMEXEC and MPROTECT off
- # (RANDEXEC is not activatable for qemu. The binaries seem to be compiled
- # with PIE enabled, though.)
- ['cPsmxER']='
- /usr/bin/qemu-alpha
- /usr/bin/qemu-arm
- /usr/bin/qemu-armeb
- /usr/bin/qemu-cris
- /usr/bin/qemu-i386
- /usr/bin/qemu-m68k
- /usr/bin/qemu-microblaze
- /usr/bin/qemu-microblazeel
- /usr/bin/qemu-mips
- /usr/bin/qemu-mipsel
- /usr/bin/qemu-ppc
- /usr/bin/qemu-ppc64
- /usr/bin/qemu-ppc64abi32
- /usr/bin/qemu-s390x
- /usr/bin/qemu-sh4
- /usr/bin/qemu-sh4eb
- /usr/bin/qemu-sparc
- /usr/bin/qemu-sparc32plus
- /usr/bin/qemu-sparc64
- /usr/bin/qemu-unicore32
- /usr/bin/qemu-x86_64
- '
- # MPROTECT off
- ['cPSmXER']="
- /usr/bin/blender
- /usr/bin/clamscan
- /usr/bin/freshclam
- /usr/bin/glxdemo
- /usr/bin/glxgears
- /usr/bin/glxinfo
- /usr/bin/kdeinit4
- /usr/bin/kdenlive
- /usr/bin/kmail
- /usr/bin/kwin
- /usr/bin/liferea
- /usr/bin/mono
- /usr/bin/mplayer
- /usr/bin/okular
- /usr/bin/qemu-system-alpha
- /usr/bin/qemu-system-arm
- /usr/bin/qemu-system-cris
- /usr/bin/qemu-system-i386
- /usr/bin/qemu-system-lm32
- /usr/bin/qemu-system-m68k
- /usr/bin/qemu-system-microblaze
- /usr/bin/qemu-system-microblazeel
- /usr/bin/qemu-system-mips
- /usr/bin/qemu-system-mips64
- /usr/bin/qemu-system-mips64el
- /usr/bin/qemu-system-mipsel
- /usr/bin/qemu-system-ppc
- /usr/bin/qemu-system-ppc64
- /usr/bin/qemu-system-ppcemb
- /usr/bin/qemu-system-s390x
- /usr/bin/qemu-system-sh4
- /usr/bin/qemu-system-sh4eb
- /usr/bin/qemu-system-sparc
- /usr/bin/qemu-system-sparc64
- /usr/bin/qemu-system-x86_64
- /usr/bin/qemu-system-xtensa
- /usr/bin/qemu-system-xtensaeb
- /usr/bin/ruby
- /usr/bin/systemsettings
- /usr/bin/tcc
- /usr/bin/valgrind
- /usr/lib/erlang/erts-*/bin/beam
- /usr/lib/erlang/erts-*/bin/beam.smp
- /usr/lib/ghc-*/ghc
- /usr/lib/valgrind/cachegrind-amd64-linux
- /usr/lib/valgrind/cachegrind-x86-linux
- /usr/lib/valgrind/callgrind-amd64-linux
- /usr/lib/valgrind/callgrind-x86-linux
- /usr/lib/valgrind/drd-amd64-linux
- /usr/lib/valgrind/drd-x86-linux
- /usr/lib/valgrind/exp-bbv-amd64-linux
- /usr/lib/valgrind/exp-bbv-x86-linux
- /usr/lib/valgrind/exp-dhat-amd64-linux
- /usr/lib/valgrind/exp-dhat-x86-linux
- /usr/lib/valgrind/exp-sgcheck-amd64-linux
- /usr/lib/valgrind/exp-sgcheck-x86-linux
- /usr/lib/valgrind/helgrind-amd64-linux
- /usr/lib/valgrind/helgrind-x86-linux
- /usr/lib/valgrind/lackey-amd64-linux
- /usr/lib/valgrind/lackey-x86-linux
- /usr/lib/valgrind/massif-amd64-linux
- /usr/lib/valgrind/massif-x86-linux
- /usr/lib/valgrind/memcheck-amd64-linux
- /usr/lib/valgrind/memcheck-x86-linux
- /usr/lib/valgrind/none-amd64-linux
- /usr/lib/valgrind/none-x86-linux
- /usr/lib/xbmc/xbmc.bin
- /usr/sbin/clamd
- /usr/sbin/grub-probe
- /usr/sbin/vbetool
- "
- # PAGEEXEC, MPROTECT, EMUTRAMP and RANDMMAP off
- ['cpSmXer']='
- /usr/bin/sbcl
- '
- # All off
- ['cpsmxer']='
- /usr/bin/wine
- /usr/bin/wine-preloader
- /usr/lib/jvm/java-6-openjdk/bin/java
- /usr/lib/jvm/java-6-openjdk/bin/javac
- /usr/lib/jvm/java-6-openjdk/jre/bin/java
- /usr/lib/jvm/java-7-openjdk/bin/javac
- /usr/lib/jvm/java-7-openjdk/jre/bin/java
- '
-)
-
-echo Some programs do not work properly without deactivating some of the PaX
-echo features. Please close all instances of them if you want to change the
-echo configuration for the following binaries:
-
-for perm in ${!perms[@]}; do
- for path in ${perms[$perm]}; do
- [ -f $path ] && echo " * $path"
- done
-done
-
-echo
-echo Continue writing PaX headers? \[Y/n\]
-
-read a
-
-case $a in
- "Y"|"y"|"")
- for perm in ${!perms[@]}; do
- for path in ${perms[$perm]}; do
- [ -f $path ] && {
- echo $perm $path
- paxctl -$perm $path
- }
- done
- done
- ;;
- *)
- exit 0
- ;;
-esac
--
cgit v1.2.3-54-g00ecf
From 6cc8339fdbf91a7d2655ab0b6b640010170d7ad5 Mon Sep 17 00:00:00 2001
From: André Fabian Silva Delgado
Date: Fri, 23 Nov 2012 22:42:08 -0200
Subject: paxutils: new package for [kernels] repo
---
kernels/paxutils/PKGBUILD | 24 +++++++
kernels/paxutils/paxutils | 174 ++++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 198 insertions(+)
create mode 100644 kernels/paxutils/PKGBUILD
create mode 100755 kernels/paxutils/paxutils
diff --git a/kernels/paxutils/PKGBUILD b/kernels/paxutils/PKGBUILD
new file mode 100644
index 000000000..4d57bec10
--- /dev/null
+++ b/kernels/paxutils/PKGBUILD
@@ -0,0 +1,24 @@
+# Maintainer: André Silva
+# Maintainer: Márcio Silva
+
+pkgname=paxutils
+pkgdesc='PaX utilities to configure flags for several binaries to work with PaX kernels'
+pkgver=0.1.0
+pkgrel=1
+arch=(any)
+url='https://projects.parabolagnulinux.org/abslibre.git/tree/kernels/pax-tuning/'
+license=(GPL2)
+depends=(bash paxctl)
+replaces=('linux-pax-flags' 'linux-libre-pax-flags')
+conflicts=('linux-pax-flags' 'linux-libre-pax-flags')
+provides=('linux-pax-flags' 'linux-libre-pax-flags')
+source=($pkgname)
+sha256sums=(bf1fda4919e7ed8052711c91933d9da5d86945ba44133c94e1952dedb4d1759b)
+
+build() {
+ return 0
+}
+
+package() {
+ install -D -m755 $srcdir/$pkgname $pkgdir/usr/bin/$pkgname
+}
diff --git a/kernels/paxutils/paxutils b/kernels/paxutils/paxutils
new file mode 100755
index 000000000..22f5a8171
--- /dev/null
+++ b/kernels/paxutils/paxutils
@@ -0,0 +1,174 @@
+#!/bin/bash
+
+[ "$UID" = "0" ] || {
+ sudo $0
+ exit $!
+}
+
+function homedir() {
+ egrep ^$1 /etc/passwd | cut -d: -f 6
+}
+
+declare -A perms
+
+perms=(
+ # RANDMMAP off
+ ['cPSMXEr']='
+ /usr/bin/grub-script-check
+ '
+ # MPROTECT and RANDMMAP off
+ ['cPSmXEr']='
+ /usr/bin/elinks
+ /usr/bin/pyrogenesis
+ /usr/lib/iceweasel/iceweasel
+ /usr/lib/iceweasel/plugin-container
+ /usr/lib/icecat/icecat
+ /usr/lib/icecat/plugin-container
+ /usr/lib/polkit-1/polkitd
+ /usr/lib/icedove/icedove
+ '
+ # SEGMEXEC and MPROTECT off
+ # (RANDEXEC is not activatable for qemu. The binaries seem to be compiled
+ # with PIE enabled, though.)
+ ['cPsmxER']='
+ /usr/bin/qemu-alpha
+ /usr/bin/qemu-arm
+ /usr/bin/qemu-armeb
+ /usr/bin/qemu-cris
+ /usr/bin/qemu-i386
+ /usr/bin/qemu-m68k
+ /usr/bin/qemu-microblaze
+ /usr/bin/qemu-microblazeel
+ /usr/bin/qemu-mips
+ /usr/bin/qemu-mipsel
+ /usr/bin/qemu-ppc
+ /usr/bin/qemu-ppc64
+ /usr/bin/qemu-ppc64abi32
+ /usr/bin/qemu-s390x
+ /usr/bin/qemu-sh4
+ /usr/bin/qemu-sh4eb
+ /usr/bin/qemu-sparc
+ /usr/bin/qemu-sparc32plus
+ /usr/bin/qemu-sparc64
+ /usr/bin/qemu-unicore32
+ /usr/bin/qemu-x86_64
+ '
+ # MPROTECT off
+ ['cPSmXER']="
+ /usr/bin/blender
+ /usr/bin/clamscan
+ /usr/bin/freshclam
+ /usr/bin/glxdemo
+ /usr/bin/glxgears
+ /usr/bin/glxinfo
+ /usr/bin/kdeinit4
+ /usr/bin/kdenlive
+ /usr/bin/kmail
+ /usr/bin/kwin
+ /usr/bin/liferea
+ /usr/bin/mono
+ /usr/bin/mplayer
+ /usr/bin/okular
+ /usr/bin/qemu-system-alpha
+ /usr/bin/qemu-system-arm
+ /usr/bin/qemu-system-cris
+ /usr/bin/qemu-system-i386
+ /usr/bin/qemu-system-lm32
+ /usr/bin/qemu-system-m68k
+ /usr/bin/qemu-system-microblaze
+ /usr/bin/qemu-system-microblazeel
+ /usr/bin/qemu-system-mips
+ /usr/bin/qemu-system-mips64
+ /usr/bin/qemu-system-mips64el
+ /usr/bin/qemu-system-mipsel
+ /usr/bin/qemu-system-ppc
+ /usr/bin/qemu-system-ppc64
+ /usr/bin/qemu-system-ppcemb
+ /usr/bin/qemu-system-s390x
+ /usr/bin/qemu-system-sh4
+ /usr/bin/qemu-system-sh4eb
+ /usr/bin/qemu-system-sparc
+ /usr/bin/qemu-system-sparc64
+ /usr/bin/qemu-system-x86_64
+ /usr/bin/qemu-system-xtensa
+ /usr/bin/qemu-system-xtensaeb
+ /usr/bin/ruby
+ /usr/bin/systemsettings
+ /usr/bin/tcc
+ /usr/bin/valgrind
+ /usr/lib/erlang/erts-*/bin/beam
+ /usr/lib/erlang/erts-*/bin/beam.smp
+ /usr/lib/ghc-*/ghc
+ /usr/lib/valgrind/cachegrind-amd64-linux
+ /usr/lib/valgrind/cachegrind-x86-linux
+ /usr/lib/valgrind/callgrind-amd64-linux
+ /usr/lib/valgrind/callgrind-x86-linux
+ /usr/lib/valgrind/drd-amd64-linux
+ /usr/lib/valgrind/drd-x86-linux
+ /usr/lib/valgrind/exp-bbv-amd64-linux
+ /usr/lib/valgrind/exp-bbv-x86-linux
+ /usr/lib/valgrind/exp-dhat-amd64-linux
+ /usr/lib/valgrind/exp-dhat-x86-linux
+ /usr/lib/valgrind/exp-sgcheck-amd64-linux
+ /usr/lib/valgrind/exp-sgcheck-x86-linux
+ /usr/lib/valgrind/helgrind-amd64-linux
+ /usr/lib/valgrind/helgrind-x86-linux
+ /usr/lib/valgrind/lackey-amd64-linux
+ /usr/lib/valgrind/lackey-x86-linux
+ /usr/lib/valgrind/massif-amd64-linux
+ /usr/lib/valgrind/massif-x86-linux
+ /usr/lib/valgrind/memcheck-amd64-linux
+ /usr/lib/valgrind/memcheck-x86-linux
+ /usr/lib/valgrind/none-amd64-linux
+ /usr/lib/valgrind/none-x86-linux
+ /usr/lib/xbmc/xbmc.bin
+ /usr/sbin/clamd
+ /usr/sbin/grub-probe
+ /usr/sbin/vbetool
+ "
+ # PAGEEXEC, MPROTECT, EMUTRAMP and RANDMMAP off
+ ['cpSmXer']='
+ /usr/bin/sbcl
+ '
+ # All off
+ ['cpsmxer']='
+ /usr/bin/wine
+ /usr/bin/wine-preloader
+ /usr/lib/jvm/java-6-openjdk/bin/java
+ /usr/lib/jvm/java-6-openjdk/bin/javac
+ /usr/lib/jvm/java-6-openjdk/jre/bin/java
+ /usr/lib/jvm/java-7-openjdk/bin/javac
+ /usr/lib/jvm/java-7-openjdk/jre/bin/java
+ '
+)
+
+echo Some programs do not work properly without deactivating some of the PaX
+echo features. Please close all instances of them if you want to change the
+echo configuration for the following binaries:
+
+for perm in ${!perms[@]}; do
+ for path in ${perms[$perm]}; do
+ [ -f $path ] && echo " * $path"
+ done
+done
+
+echo
+echo Continue writing PaX headers? \[Y/n\]
+
+read a
+
+case $a in
+ "Y"|"y"|"")
+ for perm in ${!perms[@]}; do
+ for path in ${perms[$perm]}; do
+ [ -f $path ] && {
+ echo $perm $path
+ paxctl -$perm $path
+ }
+ done
+ done
+ ;;
+ *)
+ exit 0
+ ;;
+esac
--
cgit v1.2.3-54-g00ecf
From 89919715724bf007fdcca0df3e1c884aebfd9fb1 Mon Sep 17 00:00:00 2001
From: André Fabian Silva Delgado
Date: Fri, 23 Nov 2012 22:42:59 -0200
Subject: linux-libre-grsec-3.6.7-4: updating revision due that grsec patch was
updated
---
kernels/linux-libre-grsec/PKGBUILD | 10 +++++-----
kernels/linux-libre-grsec/config.x86_64 | 4 ++--
kernels/linux-libre-grsec/linux-libre-grsec.install | 6 +++---
3 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/kernels/linux-libre-grsec/PKGBUILD b/kernels/linux-libre-grsec/PKGBUILD
index c22a208d5..c0f1eb2a9 100755
--- a/kernels/linux-libre-grsec/PKGBUILD
+++ b/kernels/linux-libre-grsec/PKGBUILD
@@ -11,9 +11,9 @@ pkgbase=linux-libre-grsec # Build stock -LIBRE-GRSEC kernel
_basekernel=3.6
_sublevel=7
_grsecver=2.9.1
-_timestamp=201211181105
+_timestamp=201211221000
pkgver=${_basekernel}.${_sublevel}
-pkgrel=3
+pkgrel=4
_lxopkgver=${_basekernel}.7 # nearly always the same as pkgver
arch=('i686' 'x86_64' 'mips64el')
url="http://linux-libre.fsfla.org/"
@@ -37,9 +37,9 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn
"http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/debuginfo/linux-patches-${_lxopkgver}-gnu_0loongsonlibre_mipsel.tar.bz2")
md5sums=('a2312edd0265b5b07bd4b50afae2b380'
'a4e642180c7d757a642175fe32e4a264'
- 'af1f2097a6e26d36801188193d3eb185'
+ '25ad4a2c727ae5d0fcfe30008a6cce09'
'508ce60a46a36c65d847c4759ac5f6c7'
- 'ec6b214e3744cc5fb38bcafb0c6218d6'
+ 'e0df7f5866d6d74ecc339347ac58ea3b'
'5f66bed97a5c37e48eb2f71b2d354b9a'
'2967cecc3af9f954ccc822fd63dca6ff'
'8267264d9a8966e57fdacd1fa1fc65c4'
@@ -161,7 +161,7 @@ build() {
_package() {
pkgdesc="The ${pkgbase} kernel and modules with grsecurity/PaX patches"
[ "${pkgbase}" = "linux-libre" ] && groups=('base')
- depends=('gradm' 'linux-libre-pax-flags' 'coreutils' 'linux-libre-firmware' 'kmod')
+ depends=('gradm' 'paxutils' 'coreutils' 'linux-libre-firmware' 'kmod')
optdepends=('crda: to set the correct wireless channels of your country')
provides=("kernel26${_kernelname}=${pkgver}" "linux${_kernelname}=${pkgver}")
conflicts=("kernel26${_kernelname}" "kernel26-libre${_kernelname}" "linux${_kernelname}")
diff --git a/kernels/linux-libre-grsec/config.x86_64 b/kernels/linux-libre-grsec/config.x86_64
index 281b26f47..c1729bff5 100644
--- a/kernels/linux-libre-grsec/config.x86_64
+++ b/kernels/linux-libre-grsec/config.x86_64
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/x86_64 3.6.1-2 Kernel Configuration
+# Linux/x86_64 3.6.7-4 Kernel Configuration
#
CONFIG_64BIT=y
# CONFIG_X86_32 is not set
@@ -5609,6 +5609,7 @@ CONFIG_PAX_USERCOPY=y
#
CONFIG_GRKERNSEC_KMEM=y
# CONFIG_GRKERNSEC_IO is not set
+CONFIG_GRKERNSEC_JIT_HARDEN=y
CONFIG_GRKERNSEC_PROC_MEMMAP=y
CONFIG_GRKERNSEC_BRUTE=y
CONFIG_GRKERNSEC_MODHARDEN=y
@@ -5690,7 +5691,6 @@ CONFIG_GRKERNSEC_BLACKHOLE=y
# Sysctl Support
#
CONFIG_GRKERNSEC_SYSCTL=y
-# CONFIG_GRKERNSEC_SYSCTL_DISTRO is not set
CONFIG_GRKERNSEC_SYSCTL_ON=y
#
diff --git a/kernels/linux-libre-grsec/linux-libre-grsec.install b/kernels/linux-libre-grsec/linux-libre-grsec.install
index ad209388f..4c65c9783 100755
--- a/kernels/linux-libre-grsec/linux-libre-grsec.install
+++ b/kernels/linux-libre-grsec/linux-libre-grsec.install
@@ -2,14 +2,14 @@
# arg 2: the old package version
KERNEL_NAME=-grsec
-KERNEL_VERSION=3.6.7-1-LIBRE-GRSEC
+KERNEL_VERSION=3.6.7-4-LIBRE-GRSEC
_fix_permissions() {
- /usr/bin/linux-pax-flags
+ /usr/bin/paxutils
echo
echo You can repeat this process after updating or installing affected
- echo binaries by running "linux-pax-flags".
+ echo binaries by running "paxutils".
}
_add_trusted_group() {
--
cgit v1.2.3-54-g00ecf
From 4591321353c89b7069c32cd0f83b36c6d825ddcc Mon Sep 17 00:00:00 2001
From: André Fabian Silva Delgado
Date: Sat, 24 Nov 2012 01:58:28 -0200
Subject: paxutils-0.1.0-2: fixing url on PKGBUILD file
---
kernels/paxutils/PKGBUILD | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/kernels/paxutils/PKGBUILD b/kernels/paxutils/PKGBUILD
index 4d57bec10..3d6d1e772 100644
--- a/kernels/paxutils/PKGBUILD
+++ b/kernels/paxutils/PKGBUILD
@@ -4,9 +4,9 @@
pkgname=paxutils
pkgdesc='PaX utilities to configure flags for several binaries to work with PaX kernels'
pkgver=0.1.0
-pkgrel=1
+pkgrel=2
arch=(any)
-url='https://projects.parabolagnulinux.org/abslibre.git/tree/kernels/pax-tuning/'
+url='https://projects.parabolagnulinux.org/abslibre.git/tree/kernels/paxutils/'
license=(GPL2)
depends=(bash paxctl)
replaces=('linux-pax-flags' 'linux-libre-pax-flags')
--
cgit v1.2.3-54-g00ecf
From 0a9a064dde6943f5ce78d9eb03f403326cd5b4ef Mon Sep 17 00:00:00 2001
From: aurelien
Date: Sat, 24 Nov 2012 09:24:52 +0100
Subject: glance nova python2-amqplib python2-carrot python2-daemon
python2-eventlet python2-iso8601 python2-kombu python2-netaddr
python2-passlib python2-pkgtools python2-sendfile python2-suds python2-webob
pyt hon-anyjson python-paste-deploy python-paste python-repoze.lru
python-routes python-wsgiref python-xattr
---
pcr/glance/PKGBUILD | 62 ++++++++++++++++++++++++++++++++++++++++
pcr/nova/PKGBUILD | 55 +++++++++++++++++++++++++++++++++++
pcr/python-anyjson/PKGBUILD | 21 ++++++++++++++
pcr/python-paste-deploy/PKGBUILD | 24 ++++++++++++++++
pcr/python-paste/PKGBUILD | 25 ++++++++++++++++
pcr/python-repoze.lru/PKGBUILD | 32 +++++++++++++++++++++
pcr/python-routes/PKGBUILD | 29 +++++++++++++++++++
pcr/python-wsgiref/PKGBUILD | 19 ++++++++++++
pcr/python-xattr/PKGBUILD | 31 ++++++++++++++++++++
pcr/python2-amqplib/PKGBUILD | 22 ++++++++++++++
pcr/python2-carrot/PKGBUILD | 21 ++++++++++++++
pcr/python2-daemon/PKGBUILD | 20 +++++++++++++
pcr/python2-eventlet/PKGBUILD | 22 ++++++++++++++
pcr/python2-iso8601/PKGBUILD | 19 ++++++++++++
pcr/python2-kombu/PKGBUILD | 29 +++++++++++++++++++
pcr/python2-netaddr/PKGBUILD | 19 ++++++++++++
pcr/python2-passlib/PKGBUILD | 21 ++++++++++++++
pcr/python2-pkgtools/PKGBUILD | 20 +++++++++++++
pcr/python2-sendfile/PKGBUILD | 22 ++++++++++++++
pcr/python2-suds/PKGBUILD | 25 ++++++++++++++++
pcr/python2-webob/Changelog | 26 +++++++++++++++++
pcr/python2-webob/PKGBUILD | 34 ++++++++++++++++++++++
22 files changed, 598 insertions(+)
create mode 100644 pcr/glance/PKGBUILD
create mode 100644 pcr/nova/PKGBUILD
create mode 100644 pcr/python-anyjson/PKGBUILD
create mode 100644 pcr/python-paste-deploy/PKGBUILD
create mode 100644 pcr/python-paste/PKGBUILD
create mode 100644 pcr/python-repoze.lru/PKGBUILD
create mode 100644 pcr/python-routes/PKGBUILD
create mode 100644 pcr/python-wsgiref/PKGBUILD
create mode 100644 pcr/python-xattr/PKGBUILD
create mode 100644 pcr/python2-amqplib/PKGBUILD
create mode 100644 pcr/python2-carrot/PKGBUILD
create mode 100644 pcr/python2-daemon/PKGBUILD
create mode 100644 pcr/python2-eventlet/PKGBUILD
create mode 100644 pcr/python2-iso8601/PKGBUILD
create mode 100644 pcr/python2-kombu/PKGBUILD
create mode 100644 pcr/python2-netaddr/PKGBUILD
create mode 100644 pcr/python2-passlib/PKGBUILD
create mode 100644 pcr/python2-pkgtools/PKGBUILD
create mode 100644 pcr/python2-sendfile/PKGBUILD
create mode 100644 pcr/python2-suds/PKGBUILD
create mode 100644 pcr/python2-webob/Changelog
create mode 100644 pcr/python2-webob/PKGBUILD
diff --git a/pcr/glance/PKGBUILD b/pcr/glance/PKGBUILD
new file mode 100644
index 000000000..a05e66686
--- /dev/null
+++ b/pcr/glance/PKGBUILD
@@ -0,0 +1,62 @@
+# Contributor: Josh Chase
+# Maintainer : Parabola GNU / Linux-libre Aurelien Desbrieres
+
+pkgname=glance
+pkgver=2012.1.2
+pkgrel=1
+_ostackver=essex
+_clientname=python-glanceclient
+_clientver=0.5.1
+pkgdesc="OpenStack image service"
+arch=('any')
+license=('custom')
+url="https://launchpad.net/$pkgname"
+depends=('python2'
+ 'python2-httplib2'
+ 'python2-webob'
+ 'python2-eventlet'
+ 'python2-greenlet'
+ 'python-paste'
+ 'python-paste-deploy'
+ 'python-routes'
+ 'python2-sqlalchemy'
+ 'python2-migrate'
+ 'python2-passlib'
+ 'python2-lxml'
+ 'python-anyjson'
+ 'python-wsgiref'
+ 'python2-argparse'
+ 'python2-boto'
+ 'python-xattr'
+ 'python2-kombu'
+ 'python2-crypto'
+ 'python2-sendfile'
+ 'python2-iso8601')
+makedepends=('python2-distribute')
+source=("https://launchpad.net/$pkgname/$_ostackver/$pkgver/+download/$pkgname-$pkgver.tar.gz"
+ "http://pypi.python.org/packages/source/${_clientname:0:1}/$_clientname/$_clientname-$_clientver.tar.gz")
+
+build() {
+ cd $srcdir
+
+ find . -type f -exec sed -i -e 's|^#!/usr/bin/python$|#!/usr/bin/python2|' \
+ -e 's|^#!/usr/bin/env python$|#!/usr/bin/env python2|' {} +
+
+ cd $srcdir/$_clientname-$_clientver
+ python2 setup.py build
+
+ cd "$srcdir/$pkgname-$pkgver"
+ python2 setup.py build
+}
+
+package() {
+ cd $srcdir/$_clientname-$_clientver
+ python2 setup.py install --root=$pkgdir
+
+ cd "$srcdir/$pkgname-$pkgver"
+ python2 setup.py install --root="$pkgdir" --optimize=1
+
+ install -dm600 "$pkgdir"/etc/$pkgname
+ install -Dm600 etc/* "$pkgdir"/etc/$pkgname/
+ install -Dm644 LICENSE "$pkgdir"/usr/share/licenses/$pkgname/LICENSE
+}
diff --git a/pcr/nova/PKGBUILD b/pcr/nova/PKGBUILD
new file mode 100644
index 000000000..181e5a626
--- /dev/null
+++ b/pcr/nova/PKGBUILD
@@ -0,0 +1,55 @@
+# Contributor: Josh Chase
+# Maintainer : Parabola GNU / Linux-libre Aurelien Desbrieres
+
+pkgname=nova
+pkgver=2012.1.2
+_clientname=python-novaclient
+_clientver=2.8.0
+pkgrel=1.1
+pkgdesc="OpenStack cloud computing fabric controller"
+arch=('any')
+license=('custom')
+url="https://launchpad.net/nova"
+depends=('python2'
+ 'python2-cheetah'
+ 'python2-simplejson'
+ 'python2-prettytable'
+ 'python2-amqplib'
+ 'python2-carrot'
+ 'python2-lockfile'
+ 'python2-daemon'
+ 'python2-gflags'
+ 'python2-netaddr'
+ 'glance'
+ 'python2-suds'
+ 'python2-paramiko'
+ 'python2-feedparser'
+ 'python2-babel' )
+makedepends=('python2-distribute')
+source=("https://launchpad.net/nova/essex/2012.1.2/+download/nova-2012.1.2.tar.gz"
+ "http://pypi.python.org/packages/source/${_clientname:0:1}/$_clientname/$_clientname-$_clientver.tar.gz")
+
+build() {
+ cd $srcdir
+
+ find . -type f -exec sed -i -e 's|^#!/usr/bin/python$|#!/usr/bin/python2|' \
+ -e 's|^#!/usr/bin/env python$|#!/usr/bin/env python2|' {} +
+
+ cd $srcdir/$_clientname-$_clientver
+ python2 setup.py build
+
+ cd "$srcdir/$pkgname-$pkgver"
+ python2 setup.py build
+}
+
+package() {
+ cd $srcdir/$_clientname-$_clientver
+ python2 setup.py install --root=$pkgdir
+
+ cd "$srcdir/$pkgname-$pkgver"
+ python2 setup.py install --root="$pkgdir" --optimize=1
+
+ install -dm600 "$pkgdir"/etc/$pkgname
+ install -Dm600 etc/$pkgname/* "$pkgdir"/etc/$pkgname/
+ install -Dm644 LICENSE "$pkgdir"/usr/share/licenses/$pkgname/LICENSE
+}
diff --git a/pcr/python-anyjson/PKGBUILD b/pcr/python-anyjson/PKGBUILD
new file mode 100644
index 000000000..8ab20d1c9
--- /dev/null
+++ b/pcr/python-anyjson/PKGBUILD
@@ -0,0 +1,21 @@
+# Contributor: Benjamin A. Shelton
+# Contributor: p2k
+# Maintainer : Parabola GNU / Linux-libre Aurelien Desbrieres
+
+pkgname=python-anyjson
+pkgver=0.3.3
+pkgrel=1
+pkgdesc="Wraps the best available JSON implementation available in a common interface."
+arch=('any')
+url="http://pypi.python.org/pypi/anyjson"
+license=('BSD')
+depends=('python2')
+makedepends=('python2-distribute')
+source=("http://pypi.python.org/packages/source/a/anyjson/anyjson-${pkgver}.tar.gz")
+
+build () {
+
+ cd "${srcdir}/anyjson-${pkgver}"
+ python2 setup.py install --root="${pkgdir}/" --optimize=1
+
+}
diff --git a/pcr/python-paste-deploy/PKGBUILD b/pcr/python-paste-deploy/PKGBUILD
new file mode 100644
index 000000000..57b7ca0d3
--- /dev/null
+++ b/pcr/python-paste-deploy/PKGBUILD
@@ -0,0 +1,24 @@
+# Contributor: David Campbell
+# Contributor: Cilyan Olowen
+# Maintainer : Parabola GNU / Linux-libre Aurelien Desbrieres
+
+pkgname=python-paste-deploy
+pkgver=1.5.0
+pkgrel=1
+pkgdesc="Load, configure, and compose WSGI applications and servers"
+arch=('any')
+url="http://pythonpaste.org/deploy/"
+license=('custom')
+depends=('python2')
+makedepends=('setuptools')
+source=(http://pypi.python.org/packages/source/P/PasteDeploy/PasteDeploy-${pkgver}.tar.gz)
+
+
+build() {
+ cd $srcdir/PasteDeploy-${pkgver}
+ python2 setup.py install --root=$pkgdir --optimize=1
+ install -Dm644 docs/license.txt $pkgdir/usr/share/licenses/$pkgname/license.txt
+ sed -i -e "s|#![ ]*/usr/bin/python$|#!/usr/bin/python2|" \
+ -e "s|#![ ]*/usr/bin/env python$|#!/usr/bin/env python2|" \
+ $(find $pkgdir -name '*.py')
+}
diff --git a/pcr/python-paste/PKGBUILD b/pcr/python-paste/PKGBUILD
new file mode 100644
index 000000000..3ffc12ca3
--- /dev/null
+++ b/pcr/python-paste/PKGBUILD
@@ -0,0 +1,25 @@
+# Contributor: David Campbell
+# Contributor: Cilyan Olowen
+# Maintainer : Parabola GNU / Linux-libre Aurelien Desbrieres
+
+pkgname=python-paste
+pkgver=1.7.5.1
+pkgrel=1
+pkgdesc="Tools for using a Web Server Gateway Interface stack."
+arch=('any')
+url="http://pythonpaste.org/index.html"
+license=('custom')
+depends=('python2')
+makedepends=('setuptools')
+source=(http://pypi.python.org/packages/source/P/Paste/Paste-${pkgver}.tar.gz)
+optdepends=('python-flup: WSGI utilities'
+ 'python-openid: Support for OpenID')
+
+build() {
+ cd ${srcdir}/Paste-${pkgver}
+ python2 setup.py install --root=${pkgdir} --optimize=1
+ install -Dm644 docs/license.txt ${pkgdir}/usr/share/licenses/$pkgname/license.txt
+ sed -i -e "s|#![ ]*/usr/bin/python$|#!/usr/bin/python2|" \
+ -e "s|#![ ]*/usr/bin/env python$|#!/usr/bin/env python2|" \
+ $(find $pkgdir -name '*.py')
+}
diff --git a/pcr/python-repoze.lru/PKGBUILD b/pcr/python-repoze.lru/PKGBUILD
new file mode 100644
index 000000000..844658c27
--- /dev/null
+++ b/pcr/python-repoze.lru/PKGBUILD
@@ -0,0 +1,32 @@
+# Contributor: speps
+# Contributor: DasIch
+# Maintainer : Paraobla GNU / Linux-libre Aurelien Desbrieres
+
+_name=repoze.lru
+pkgname=python-$_name
+pkgver=0.6
+pkgrel=1
+pkgdesc="A tiny LRU cache implementation and decorator"
+arch=('any')
+license=('custom:BSD')
+url="http://pypi.python.org/pypi/$_name"
+depends=('python')
+makedepends=('python-distribute')
+provides=(python-repoze-lru)
+conflicts=(python-repoze-lru)
+replaces=(python-repoze-lru)
+source=("http://pypi.python.org/packages/source/r/$_name/$_name-$pkgver.tar.gz")
+
+build() {
+ cd "$srcdir/$_name-$pkgver"
+ python setup.py build
+}
+
+package() {
+ cd "$srcdir/$_name-$pkgver"
+ python setup.py install --root="$pkgdir/"
+
+ # license
+ install -Dm644 LICENSE.txt \
+ "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+}
diff --git a/pcr/python-routes/PKGBUILD b/pcr/python-routes/PKGBUILD
new file mode 100644
index 000000000..511934ef2
--- /dev/null
+++ b/pcr/python-routes/PKGBUILD
@@ -0,0 +1,29 @@
+# Contributor: SpepS
+# Contributor: David Moore
+# Contributor: Nathan Jones
+# Maintainer : Parabola GNU / Linux-libre Aurelien Desbrieres
+
+pkgname=python-routes
+pkgver=1.13
+pkgrel=2
+pkgdesc="A routing package for Python that matches URL's to dicts and vice versa"
+arch=('any')
+url="http://pypi.python.org/pypi/Routes"
+license=('custom:BSD')
+depends=('python-repoze.lru')
+makedepends=('python-distribute')
+source=("http://pypi.python.org/packages/source/R/Routes/Routes-$pkgver.tar.gz")
+
+build() {
+ cd "$srcdir/Routes-$pkgver"
+ python setup.py build
+}
+
+package() {
+ cd "$srcdir/Routes-$pkgver"
+
+ python setup.py install --root="$pkgdir/"
+ install -Dm644 LICENSE \
+ "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+}
+
diff --git a/pcr/python-wsgiref/PKGBUILD b/pcr/python-wsgiref/PKGBUILD
new file mode 100644
index 000000000..3f3b38bd2
--- /dev/null
+++ b/pcr/python-wsgiref/PKGBUILD
@@ -0,0 +1,19 @@
+# Contributor: Philipp Schmidt
+# Maintainer : Parabola GNU / Linux-libre Aurelien Desbrieres
+
+pkgname=python-wsgiref
+pkgver=0.1.2
+pkgrel=2
+pkgdesc="WSGI (PEP 333) Reference Library"
+arch=('i686' 'x86_64')
+url="http://cheeseshop.python.org/pypi/wsgiref"
+license=('PSF or ZPL')
+depends=('python2')
+makedepends=('unzip' 'setuptools')
+source=("http://pypi.python.org/packages/source/w/wsgiref/wsgiref-$pkgver.zip")
+
+build() {
+ cd "$srcdir/wsgiref-$pkgver"
+
+ python2 setup.py install --root=$pkgdir
+}
diff --git a/pcr/python-xattr/PKGBUILD b/pcr/python-xattr/PKGBUILD
new file mode 100644
index 000000000..d6977f435
--- /dev/null
+++ b/pcr/python-xattr/PKGBUILD
@@ -0,0 +1,31 @@
+# Maintainer : Parabola GNU / Linux-libre Aurelien Desbrieres
+
+pkgname=python-xattr
+pkgver=20111028
+pkgrel=1
+pkgdesc="module for manipulating filesystem extended attributes"
+arch=('i686' 'x86_64')
+url="http://undefined.org/python/#xattr"
+license=('MIT')
+conflicts=('pyattr')
+provied=('pyattr')
+makedepends=('setuptools')
+depends=('python2' 'git')
+
+_gitroot=https://github.com/xattr/xattr.git
+_gitname=xattr
+
+build() {
+ cd $srcdir/
+
+ if [ -e ${_gitname} ] ; then
+ cd ${_gitname}
+ git pull
+ cd ..
+ else
+ git clone ${_gitroot} ${_gitname}
+ fi
+
+ cd $srcdir/xattr/
+ python2 setup.py install --prefix=/usr --root=$pkgdir
+}
diff --git a/pcr/python2-amqplib/PKGBUILD b/pcr/python2-amqplib/PKGBUILD
new file mode 100644
index 000000000..d67800a06
--- /dev/null
+++ b/pcr/python2-amqplib/PKGBUILD
@@ -0,0 +1,22 @@
+# Contributor: Tevin Zhang
+# Maintainer : Parabola GNU / Linux-libre Aurelien Desbrieres
+
+pkgname=python2-amqplib
+pkgver=1.0.2
+pkgrel=3
+pkgdesc="Python client for the Advanced Message Queuing Procotol (AMQP). Uses Python2."
+arch=('any')
+url="http://code.google.com/p/py-amqplib/"
+license=("LGPL")
+depends=('python2>=2.6' 'setuptools')
+source=(http://py-amqplib.googlecode.com/files/amqplib-$pkgver.tgz)
+
+build() {
+ cd $srcdir/amqplib-$pkgver
+
+ # replace /usr/bin/env python with python2
+ find . -name '*.py' -exec sed -i -e '1 s/python\s*$/python2/' {} \;
+
+ python2 ./setup.py install --root=$pkgdir --prefix=/usr || return 1
+}
+
diff --git a/pcr/python2-carrot/PKGBUILD b/pcr/python2-carrot/PKGBUILD
new file mode 100644
index 000000000..b620eca9e
--- /dev/null
+++ b/pcr/python2-carrot/PKGBUILD
@@ -0,0 +1,21 @@
+# Contributor: Lukas Linhart
+# Contributor: Marco Elver
+# Maintainer : Parabola GNU / Linux-libre Aurelien Desbrieres
+
+pkgname=python2-carrot
+pkgver=0.10.5
+pkgrel=1
+pkgdesc="AMQP Messaging Framwork for Python"
+arch=('any')
+url='http://ask.github.com/carrot/'
+license=('BSD')
+depends=('python2' 'python2-amqplib')
+makedepends=('setuptools')
+source=("http://pypi.python.org/packages/source/c/carrot/carrot-$pkgver.tar.gz")
+options=(!emptydirs)
+
+build() {
+ cd ${srcdir}/carrot-$pkgver
+ python2 setup.py install --root=$pkgdir/ --optimize=1 || return 1
+}
+
diff --git a/pcr/python2-daemon/PKGBUILD b/pcr/python2-daemon/PKGBUILD
new file mode 100644
index 000000000..18358f9cb
--- /dev/null
+++ b/pcr/python2-daemon/PKGBUILD
@@ -0,0 +1,20 @@
+# Contributor: Massimiliano Torromeo
+# Maintainer : Parabola GNU / Linux-libre Aurelien Desbrieres
+
+pkgname=python2-daemon
+pkgver=1.6
+pkgrel=2
+pkgdesc="Library to implement a well-behaved Unix daemon process"
+license=("PSF-2+")
+url="http://pypi.python.org/pypi/python-daemon"
+depends=('python2-lockfile')
+makedepends=('python2-distribute')
+source=(http://pypi.python.org/packages/source/p/python-daemon/python-daemon-$pkgver.tar.gz)
+arch=('any')
+options=(!emptydirs)
+
+build() {
+ cd "$srcdir/python-daemon-$pkgver"
+ python2 setup.py install --root="$pkgdir"
+}
+
diff --git a/pcr/python2-eventlet/PKGBUILD b/pcr/python2-eventlet/PKGBUILD
new file mode 100644
index 000000000..d9dc41d8d
--- /dev/null
+++ b/pcr/python2-eventlet/PKGBUILD
@@ -0,0 +1,22 @@
+# -*- shell-script -*-
+#Maintainer : Parabola GNU / Linux-libre Aurelien Desbrieres
+
+python=python2
+name=eventlet
+
+pkgname=$python-$name
+pkgver=0.9.16
+pkgrel=1
+pkgdesc="Highly concurrent networking library"
+arch=(any)
+url="http://eventlet.net"
+license=(MIT)
+depends=('python2-greenlet' 'python' 'python2-distribute')
+makedepends=("$python")
+source=("http://pypi.python.org/packages/source/e/$name/$name-$pkgver.tar.gz")
+
+build() {
+ cd "$srcdir/$name-$pkgver"
+ $python setup.py install --prefix=/usr --root=$pkgdir
+}
+
diff --git a/pcr/python2-iso8601/PKGBUILD b/pcr/python2-iso8601/PKGBUILD
new file mode 100644
index 000000000..08ca49004
--- /dev/null
+++ b/pcr/python2-iso8601/PKGBUILD
@@ -0,0 +1,19 @@
+# Contributor: WU Jun
+# Contributor: Vsevolod Balashov
+# Maintainer : Parabola GNU / Linux-libre Aurelien Desbrieres
+
+name=iso8601
+pkgname=python2-$name
+pkgver=0.1.4
+pkgrel=3
+pkgdesc="Simple module to parse ISO 8601 dates"
+arch=(any)
+url="http://pypi.python.org/pypi/$name"
+license=(MIT)
+depends=(python2)
+makedepends=(python2-distribute)
+source=("http://pypi.python.org/packages/source/i/$name/$name-$pkgver.tar.gz")
+build() {
+ cd "$srcdir/$name-$pkgver"
+ python2 setup.py install --prefix=/usr --root=$pkgdir || return 1
+}
diff --git a/pcr/python2-kombu/PKGBUILD b/pcr/python2-kombu/PKGBUILD
new file mode 100644
index 000000000..ef99b0beb
--- /dev/null
+++ b/pcr/python2-kombu/PKGBUILD
@@ -0,0 +1,29 @@
+# Contributor: Felix Yan
+# Maintainer : Parabola GNU / Linux-libre Aurelien Desbrieres
+
+pkgname=python2-kombu
+pkgver=2.4.10
+pkgrel=1
+pkgdesc="AMQP Messaging Framework for Python 2.x"
+arch=('any')
+url="http://pypi.python.org/pypi/kombu/"
+license=('BSD')
+depends=('python2' 'python-anyjson')
+optdepends=(
+ "python2-librabbitmq: High performance AMQP transport written in C"
+)
+makedepends=('setuptools')
+source=("http://pypi.python.org/packages/source/k/kombu/kombu-$pkgver.tar.gz")
+options=(!emptydirs)
+
+build() {
+ cd "$srcdir"/kombu-$pkgver
+ python2 setup.py build
+}
+
+package() {
+ cd "$srcdir"/kombu-$pkgver
+ python2 setup.py install --root="$pkgdir/"
+ install -D -m644 LICENSE "$pkgdir"/usr/share/licenses/$pkgname/LICENSE
+}
+
diff --git a/pcr/python2-netaddr/PKGBUILD b/pcr/python2-netaddr/PKGBUILD
new file mode 100644
index 000000000..8d9f2a827
--- /dev/null
+++ b/pcr/python2-netaddr/PKGBUILD
@@ -0,0 +1,19 @@
+# Contributor: Sebastien LEDUC
+# Contributor: Gilles CHAUVIN
+# Maintainer : Parabola GNU / Linux-libre Aurelien Desbrieres
+
+pkgname=python2-netaddr
+pkgver=0.7.10
+pkgrel=1
+pkgdesc="A pure Python network address representation and manipulation library"
+arch=('i686' 'x86_64')
+license=('BSD')
+url="http://github.com/drkjam/netaddr/"
+depends=('python2')
+source=("http://github.com/downloads/drkjam/netaddr/netaddr-$pkgver.tar.gz")
+
+build() {
+ cd "$srcdir/netaddr-$pkgver/"
+ python2 setup.py install --root="$pkgdir/" --optimize=1
+}
+
diff --git a/pcr/python2-passlib/PKGBUILD b/pcr/python2-passlib/PKGBUILD
new file mode 100644
index 000000000..753677827
--- /dev/null
+++ b/pcr/python2-passlib/PKGBUILD
@@ -0,0 +1,21 @@
+# Contributor: onny
+# Contributor: onny
+# Maintainer : Parabola GNU /Linux-libre Aurelien Desbrieres
+
+pkgname=python2-passlib
+pkgver=1.6.1
+pkgrel=1
+pkgdesc="A password hashing library for Python."
+arch=('i686' 'x86_64')
+url=("https://code.google.com/p/passlib/")
+license=('custom')
+depends=('python2')
+source=("https://passlib.googlecode.com/files/passlib-${pkgver}.tar.gz")
+sha512sums=('93c047dc0a06f19a20e5da97db43c5c76e06d69baeac15cc932ef0306ae22dac5c1a3925889a140fd181ab4e00ac513ec829951e15babf5aad89bd2d08dc9907')
+
+build() {
+ cd "$srcdir/passlib-${pkgver}"
+ python2 setup.py build install --root="${pkgdir}" || return 1
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/pcr/python2-pkgtools/PKGBUILD b/pcr/python2-pkgtools/PKGBUILD
new file mode 100644
index 000000000..7060dc416
--- /dev/null
+++ b/pcr/python2-pkgtools/PKGBUILD
@@ -0,0 +1,20 @@
+# Contributor: Fabien Devaux
+# Maintainer : Parabola GNU / Linux-libre Aurelien Desbrieres
+
+pkgname=python2-pkgtools
+pkgver=0.7.1
+pkgrel=1
+pkgdesc="Python packages tools"
+arch=('any')
+url="http://pkgtools.readthedocs.org/en/latest/"
+license=('MIT')
+depends=('python2')
+makedepends=('python2-distribute')
+source=(http://pypi.python.org/packages/source/p/pkgtools/pkgtools-${pkgver}.tar.gz)
+
+build() {
+ cd "${srcdir}/pkgtools-${pkgver}"
+ python2 setup.py build || exit 1
+ python2 setup.py install --root="${pkgdir}" --optimize=1 || exit 1
+}
+
diff --git a/pcr/python2-sendfile/PKGBUILD b/pcr/python2-sendfile/PKGBUILD
new file mode 100644
index 000000000..3de2d5a48
--- /dev/null
+++ b/pcr/python2-sendfile/PKGBUILD
@@ -0,0 +1,22 @@
+# Contributor: Josh Chase
+# Maintainer : Parabola GNU / Linux-libre Aurelien Desbrieres
+
+pkgname=python2-sendfile
+_pkgname=py-sendfile
+pkgver=1.2.3
+pkgrel=1
+pkgdesc="pysendfile"
+url="http://code.google.com/p/pysendfile"
+license=('MIT')
+arch=('i686' 'x86_64')
+depends=('python2' 'setuptools')
+conflicts=()
+replaces=()
+backup=()
+source=("http://pypi.python.org/packages/source/${_pkgname:0:1}/$_pkgname/$_pkgname-$pkgver.tar.gz")
+
+build() {
+ cd $srcdir/$_pkgname-$pkgver
+ python2 setup.py build
+ python2 setup.py install --root=$pkgdir
+ }
diff --git a/pcr/python2-suds/PKGBUILD b/pcr/python2-suds/PKGBUILD
new file mode 100644
index 000000000..a45009a2b
--- /dev/null
+++ b/pcr/python2-suds/PKGBUILD
@@ -0,0 +1,25 @@
+# Contributor: Jonathan Liu
+# Maintainer : Parabola GNU / Linux-libre Aurelien Desbrieres
+
+pkgname=python2-suds
+pkgver=0.4
+pkgrel=3
+pkgdesc="A lightweight SOAP python client."
+arch=('any')
+url="https://fedorahosted.org/suds/"
+license=('LGPL')
+depends=('python2')
+makedepends=('python2-distribute')
+source=("https://fedorahosted.org/releases/s/u/suds/python-suds-${pkgver}.tar.gz")
+
+build() {
+ cd "${srcdir}/python-suds-${pkgver}"
+ python2 setup.py build
+}
+
+package() {
+ cd "${srcdir}/python-suds-${pkgver}"
+ python2 setup.py install --root="${pkgdir}" -O1
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/pcr/python2-webob/Changelog b/pcr/python2-webob/Changelog
new file mode 100644
index 000000000..d67f3b16b
--- /dev/null
+++ b/pcr/python2-webob/Changelog
@@ -0,0 +1,26 @@
+2012-10-30 Aaron DeVore (1.2.3-1)
+- Version bump to 1.2.3
+- Change WebOb-${pkgver}.zip to WebOb-${pkgver}.tar.gz
+2012-06-07 Aaron DeVore (1.2.2-1)
+- Version bump to 1.2.2
+2012-06-07 Aaron DeVore (1.2-1)
+- Version bump to 1.2
+2012-10-07 Aaron DeVore
+- Version bump to 1.1.1
+2011-8-8 Aaron DeVore (1.1b2)
+- Version bump to 1.1b2
+- Add python-sphinx to makedepends
+2011-5-14 Aaron DeVore (1.0.7-2)
+- Revert from split build (AUR doesn't work with split builds)
+2011-5-14 Aaron DeVore (1.0.7-1)
+- Version bump to 1.0.7
+- Switch to split build
+- Split Sphinx html docs into python-webob-docs package
+- Don't bundle license file (upstream has restored it)
+2011-4-13 Aaron DeVore (1.0.6-1)
+- Version bump to 1.0.6
+- Bundle the license file (upstream removed it from the Pypi zip file)
+2011-3-24 Aaron DeVore (1.0.5-1)
+- Version bump to 1.0.5
+- Fix source URL (file extension changed on Pypi)
+- Fix some recently change idioms
diff --git a/pcr/python2-webob/PKGBUILD b/pcr/python2-webob/PKGBUILD
new file mode 100644
index 000000000..8dd0df386
--- /dev/null
+++ b/pcr/python2-webob/PKGBUILD
@@ -0,0 +1,34 @@
+# Contributor: Aaron DeVore
+# Contributor: Cilyan Olowen
+# Maintainer : Parabola GNU / Linux-libre Aurelien Desbrieres
+
+pkgname='python2-webob'
+pkgver='1.2.3'
+pkgrel='1'
+pkgdesc="WebOb provides objects for HTTP requests and responses."
+arch=('any')
+url="http://webob.org/"
+license=('MIT')
+depends=('python2')
+makedepends=('python2-distribute')
+optdepends=('python-webob-docs: documentation')
+changelog='Changelog'
+source=("http://pypi.python.org/packages/source/W/WebOb/WebOb-${pkgver}.tar.gz")
+
+build() {
+ cd "$srcdir/WebOb-${pkgver}"
+ python2 setup.py build
+}
+
+package() {
+ cd "$srcdir/WebOb-${pkgver}"
+ python2 setup.py install "--root=$pkgdir" --optimize=1
+ install -D -m644 "docs/license.txt" \
+ "$pkgdir/usr/share/licenses/$pkgname/license.txt"
+}
+
+check() {
+ cd "$srcdir/WebOb-${pkgver}"
+ python2 setup.py test
+}
+
--
cgit v1.2.3-54-g00ecf
From 195c4578406bed02fbbb75e19abfb302d9a1f5fb Mon Sep 17 00:00:00 2001
From: Michał Masłowski
Date: Sat, 24 Nov 2012 14:00:39 +0100
Subject: enscript-1.6.6-1 fixing issue #225.
---
libre/enscript/PKGBUILD | 32 ++++++++++++++++++++++++++++++++
1 file changed, 32 insertions(+)
create mode 100644 libre/enscript/PKGBUILD
diff --git a/libre/enscript/PKGBUILD b/libre/enscript/PKGBUILD
new file mode 100644
index 000000000..281675296
--- /dev/null
+++ b/libre/enscript/PKGBUILD
@@ -0,0 +1,32 @@
+# $Id: PKGBUILD 150464 2012-02-18 00:24:06Z allan $
+# Maintainer: Paul Mattal
+# Contributor: Tom Newsom
+
+pkgname=enscript
+pkgver=1.6.6
+pkgrel=1
+pkgdesc="Convert ASCII files to PostScript suitable for printing"
+arch=('i686' 'x86_64' 'mips64el')
+backup=('etc/enscript/enscript.cfg')
+depends=('glibc')
+license=('GPL2' 'custom')
+source=(ftp://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.gz)
+md5sums=('3acc242b829adacabcaf28533f049afd')
+url="http://git.savannah.gnu.org/cgit/enscript.git"
+
+build() {
+ cd $srcdir/$pkgname-$pkgver
+ ./configure --prefix=/usr --sysconfdir=/etc/enscript --mandir=/usr/share/man \
+ --infodir=/usr/share/info
+ make
+}
+
+package() {
+ cd $srcdir/$pkgname-$pkgver
+ make prefix=$pkgdir/usr \
+ sysconfdir=$pkgdir/etc/enscript mandir=$pkgdir/usr/share/man \
+ infodir=$pkgdir/usr/share/info install
+ install -D -m644 afm/MustRead.html "${pkgdir}/usr/share/licenses/${pkgname}/MustRead.html"
+}
+
+# vim: ts=2 sw=2 et ft=sh
--
cgit v1.2.3-54-g00ecf
From 76f02e67987546467ddcdb2d006533c9d8e791b5 Mon Sep 17 00:00:00 2001
From: Michał Masłowski
Date: Sat, 24 Nov 2012 21:40:14 +0100
Subject: New thinkfan on pcr.
---
pcr/thinkfan/PKGBUILD | 27 ++++++++++++++++++++++
pcr/thinkfan/thinkfan | 54 +++++++++++++++++++++++++++++++++++++++++++
pcr/thinkfan/thinkfan.service | 9 ++++++++
~mtjm/thinkfan/PKGBUILD | 36 -----------------------------
~mtjm/thinkfan/thinkfan | 54 -------------------------------------------
5 files changed, 90 insertions(+), 90 deletions(-)
create mode 100644 pcr/thinkfan/PKGBUILD
create mode 100644 pcr/thinkfan/thinkfan
create mode 100644 pcr/thinkfan/thinkfan.service
delete mode 100755 ~mtjm/thinkfan/PKGBUILD
delete mode 100755 ~mtjm/thinkfan/thinkfan
diff --git a/pcr/thinkfan/PKGBUILD b/pcr/thinkfan/PKGBUILD
new file mode 100644
index 000000000..18a97754f
--- /dev/null
+++ b/pcr/thinkfan/PKGBUILD
@@ -0,0 +1,27 @@
+# Maintainer: nblock
+# Contributor: Frederik Alkærsig (FALKER)
+
+pkgname=thinkfan
+pkgver=0.8.1
+pkgrel=3
+pkgdesc="A minimalist fan control program. Supports the sysfs hwmon interface and thinkpad_acpi"
+arch=('i686' 'x86_64' 'mips64el')
+license=('GPL')
+source=(http://downloads.sourceforge.net/project/${pkgname}/${pkgname}-${pkgver}.tar.gz
+ "thinkfan" "thinkfan.service")
+url="http://thinkfan.sourceforge.net/"
+md5sums=('aaa6c88bab3b43756ac5a1638622828c'
+ '16fc3a83a1468e3ccaeba67e14ab2177'
+ '7639b82035fcee712753e05de6b0601d')
+
+build() {
+ cd ${srcdir}/${pkgname}-${pkgver}
+ make
+ install -D -m755 ${pkgname} ${pkgdir}/usr/sbin/${pkgname}
+ install -D -m755 ${srcdir}/${pkgname} ${pkgdir}/etc/rc.d/${pkgname}
+ install -D -m644 README ${pkgdir}/usr/share/doc/${pkgname}/README
+ install -D -m644 ${srcdir}/thinkfan.service ${pkgdir}/usr/lib/systemd/system/thinkfan.service
+ cp -r examples ${pkgdir}/usr/share/doc/${pkgname}/
+}
+
+# vim:set ts=2 sw=2 noet:
diff --git a/pcr/thinkfan/thinkfan b/pcr/thinkfan/thinkfan
new file mode 100644
index 000000000..d37c81424
--- /dev/null
+++ b/pcr/thinkfan/thinkfan
@@ -0,0 +1,54 @@
+#!/bin/bash
+
+. /etc/rc.conf
+. /etc/rc.d/functions
+
+test -f /usr/sbin/thinkfan || exit 0
+
+case "$1" in
+ start)
+ stat_busy "Starting thinkfan"
+ /usr/sbin/thinkfan -- -q -s5 >/dev/null 2>&1
+ if [ $? -gt 0 ]; then
+ stat_fail
+ else
+ add_daemon thinkfan
+ stat_done
+ fi
+ ;;
+ stop)
+ stat_busy "Stopping thinkfan"
+ PID=$(/dev/null 2>&1
+ if [ $? -gt 0 ]; then
+ stat_fail
+ rm_daemon thinkfan
+ else
+ stat_done
+ fi
+ fi
+ ;;
+ *)
+ echo "Usage: $0 {stop|start|restart}"
+ ;;
+esac
+exit 0
diff --git a/pcr/thinkfan/thinkfan.service b/pcr/thinkfan/thinkfan.service
new file mode 100644
index 000000000..7895b8d3a
--- /dev/null
+++ b/pcr/thinkfan/thinkfan.service
@@ -0,0 +1,9 @@
+[Unit]
+Description=Thinkfan Daemon - simple and lightweight fan control program
+After=basic.target
+
+[Service]
+ExecStart=/usr/sbin/thinkfan -n -s5 -q
+
+[Install]
+WantedBy=multi-user.target
diff --git a/~mtjm/thinkfan/PKGBUILD b/~mtjm/thinkfan/PKGBUILD
deleted file mode 100755
index 9bb9a4793..000000000
--- a/~mtjm/thinkfan/PKGBUILD
+++ /dev/null
@@ -1,36 +0,0 @@
-# Parabola maintainer: Michał Masłowski
-# From https://aur.archlinux.org/packages.php?ID=24359
-# Maintainer: nblock
-# Contributor: Frederik Alkærsig (FALKER)
-
-pkgname=thinkfan
-pkgver=0.7.3
-pkgrel=1
-pkgdesc="A minimalist fan control program. Supports the sysfs hwmon interface and thinkpad_acpi"
-arch=('i686' 'x86_64' 'mips64el')
-license=('GPL3')
-source=(http://downloads.sourceforge.net/project/${pkgname}/${pkgname}-${pkgver}.tar.gz "thinkfan")
-url="http://thinkfan.sourceforge.net/"
-#backup=('etc/thinkfan.conf')
-md5sums=('d1b0d7a05b37cce412ee227cf759a9f6'
- '16fc3a83a1468e3ccaeba67e14ab2177')
-
-build() {
- cd ${srcdir}/${pkgname}-${pkgver}
- make
- install -D -m755 ${pkgname} ${pkgdir}/usr/sbin/${pkgname}
- install -D -m755 ${srcdir}/${pkgname} ${pkgdir}/etc/rc.d/${pkgname}
-
- # A better way would be to check it at install time.
-# if ! [[ -f /proc/acpi/ibm/fan ]]; then
-# echo "thinkpad_acpi procfs entries don't seem to exist." \
-# "You'll need to use the generic sysfs hwmon interface. Will use sysfs conf."
- install -D -m644 thinkfan.conf.sysfs ${pkgdir}/etc/thinkfan.conf.sysfs
-# else
-# echo "This seems to be a Thinkpad. You should use the IBM" \
-# "interface. Will use thinkfan conf."
- [ "${CARCH}" = "mips64el" ] || install -D -m644 thinkfan.conf.thinkpad ${pkgdir}/etc/thinkfan.conf.thinkpad
-# fi
-}
-
-# vim:set ts=2 sw=2 noet:
diff --git a/~mtjm/thinkfan/thinkfan b/~mtjm/thinkfan/thinkfan
deleted file mode 100755
index d37c81424..000000000
--- a/~mtjm/thinkfan/thinkfan
+++ /dev/null
@@ -1,54 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-test -f /usr/sbin/thinkfan || exit 0
-
-case "$1" in
- start)
- stat_busy "Starting thinkfan"
- /usr/sbin/thinkfan -- -q -s5 >/dev/null 2>&1
- if [ $? -gt 0 ]; then
- stat_fail
- else
- add_daemon thinkfan
- stat_done
- fi
- ;;
- stop)
- stat_busy "Stopping thinkfan"
- PID=$(/dev/null 2>&1
- if [ $? -gt 0 ]; then
- stat_fail
- rm_daemon thinkfan
- else
- stat_done
- fi
- fi
- ;;
- *)
- echo "Usage: $0 {stop|start|restart}"
- ;;
-esac
-exit 0
--
cgit v1.2.3-54-g00ecf
From 5c508409510096b2a656cf0534ef6388c3b120fb Mon Sep 17 00:00:00 2001
From: André Fabian Silva Delgado
Date: Mon, 26 Nov 2012 03:02:08 -0200
Subject: icedove-libre-17.0.1-1: updating version
---
libre/icedove-libre/Icedove-branding.patch | 37 ++++++++++++++++++++++++++++++
libre/icedove-libre/PKGBUILD | 19 ++++++++++-----
2 files changed, 50 insertions(+), 6 deletions(-)
create mode 100644 libre/icedove-libre/Icedove-branding.patch
diff --git a/libre/icedove-libre/Icedove-branding.patch b/libre/icedove-libre/Icedove-branding.patch
new file mode 100644
index 000000000..751305147
--- /dev/null
+++ b/libre/icedove-libre/Icedove-branding.patch
@@ -0,0 +1,37 @@
+From: =?UTF-8?q?Guido=20G=C3=BCnther?=
+Date: Sat, 24 Nov 2012 11:36:16 +0100
+Subject: Icedove branding
+
+---
+ mail/app/application.ini | 2 +-
+ mail/confvars.sh | 4 ++--
+ 2 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/mail/app/application.ini b/mail/app/application.ini
+index 8380eb7..12902c2 100644
+--- a/mail/app/application.ini
++++ b/mail/app/application.ini
+@@ -4,7 +4,7 @@
+
+ #filter substitution
+ [App]
+-Name=Thunderbird
++Name=Icedove
+ Version=@APP_VERSION@
+ BuildID=@GRE_BUILDID@
+ #ifdef MOZ_SOURCE_REPO
+diff --git a/mail/confvars.sh b/mail/confvars.sh
+index 5c34d70..395bb87 100755
+--- a/mail/confvars.sh
++++ b/mail/confvars.sh
+@@ -3,8 +3,8 @@
+ # License, v. 2.0. If a copy of the MPL was not distributed with this
+ # file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+-MOZ_APP_BASENAME=Thunderbird
+-MOZ_APP_NAME=thunderbird
++MOZ_APP_BASENAME=Icedove
++MOZ_APP_NAME=icedove
+ MOZ_UPDATER=1
+ MOZ_THUNDERBIRD=1
+ MOZ_CHROME_FILE_FORMAT=omni
diff --git a/libre/icedove-libre/PKGBUILD b/libre/icedove-libre/PKGBUILD
index 6ec577f58..d61b756f5 100755
--- a/libre/icedove-libre/PKGBUILD
+++ b/libre/icedove-libre/PKGBUILD
@@ -3,7 +3,7 @@
# We're getting this from Debian Experimental
_debname=icedove
-_debver=16.0.2
+_debver=17.0
_debrel=1
_debrepo=http://ftp.debian.org/debian/pool/main/
debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; }
@@ -11,7 +11,7 @@ debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; }
_pkgname=${_debname}
pkgname=${_debname}-libre
pkgver=${_debver}.${_debrel}
-pkgrel=3
+pkgrel=1
pkgdesc="A libre version of Debian Icedove, the Standalone Mail/News reader based on Mozilla Thunderbird."
arch=('i586' 'i686' 'x86_64' 'mips64el')
license=('GPL2' 'MPL' 'LGPL')
@@ -30,16 +30,18 @@ source=("${_debrepo}/`debfile ${_debname}`_${_debver}.orig.tar.bz2"
vendor.js
makefile.patch
branding.patch
- ${_pkgname}.desktop)
+ ${_pkgname}.desktop
+ Icedove-branding.patch)
options=(!emptydirs)
-md5sums=('a3724f40d28014acf593528bb8a048f0'
- '53d62a4841d7989d1f6d1b04929394b4'
+md5sums=('f011e0308a0758df772638836fb03709'
+ '8534a19b46ce21d80fce16b50f1f37bd'
'd6d58d3104a44624e0a3d227cdf1c211'
'476ec205162340fb0679f522c9d31c3b'
'4eecc4fc5aafaf0da651a09eadc90bee'
'c4ed43e85945e180a89cce03e45ec62c'
'126b1446212396c33220936c01d9592d'
- 'e785e0c267f4435ae1a9aa0b03bcacfb')
+ 'e785e0c267f4435ae1a9aa0b03bcacfb'
+ 'ea5f7a06967f561d47d7e5c35b23de6f')
build() {
export QUILT_PATCHES=debian/patches
@@ -58,10 +60,15 @@ build() {
for i in 48x48 64x64; do
install -Dm644 "debian/app-icons/${_pkgname}${i/x*/}.png" "${srcdir}/${DEBIAN_BUILD}/mail/branding/${_pkgname}/content/icon${i/x*/}.png"
done
+
+ # This patch has a orthographic issue ("Icdove" instead of "Icedove") in MOZ_APP_BASENAME line for confvars.sh
+ rm -v debian/patches/debian-hacks/Icedove-branding.patch || true
+
quilt push -av
patch -Np1 -i "${srcdir}/makefile.patch" # small fix
patch -Np1 -i "${srcdir}/branding.patch" # fixing branding
+ patch -Np1 -i "${srcdir}/Icedove-branding.patch" # debian patch fixed version
cp "${srcdir}/mozconfig" .mozconfig
make -j1 -f client.mk build MOZ_MAKE_FLAGS="${MAKEFLAGS}"
--
cgit v1.2.3-54-g00ecf
From 2fa90d9fe76fa960bb7ee786403340ca1b0dc393 Mon Sep 17 00:00:00 2001
From: André Fabian Silva Delgado
Date: Mon, 26 Nov 2012 03:41:10 -0200
Subject: icedove-i18n-17.0.1-1: updating version
---
libre/icedove-i18n/PKGBUILD | 112 ++++++++++++++++++++++----------------------
1 file changed, 56 insertions(+), 56 deletions(-)
diff --git a/libre/icedove-i18n/PKGBUILD b/libre/icedove-i18n/PKGBUILD
index 7d0aa1d8b..d7dbbb211 100755
--- a/libre/icedove-i18n/PKGBUILD
+++ b/libre/icedove-i18n/PKGBUILD
@@ -2,7 +2,7 @@
# Maintainer: André Silva
pkgbase=icedove-i18n
-pkgver=16.0.2.1
+pkgver=17.0.1
pkgname=('icedove-i18n-ar'
'icedove-i18n-ast'
'icedove-i18n-be'
@@ -473,58 +473,58 @@ package_icedove-i18n-zh-tw() {
cd ${srcdir}
install -Dm644 icedove-i18n-$pkgver-zh-TW.xpi "${pkgdir}/$_path/langpack-zh-TW@icedove.mozilla.org.xpi"
}
-md5sums=('9c4a59c7da66e2354164c3a5bc7af21d'
- '1cc30ebb50c2ff783b07060fe14b4260'
- 'bd2a994f1b0aa8d71b7f432f582e08b5'
- '1b7d5f199b714e5d235cdadc89882c82'
- 'a5945807be0c8e205cf0f4be41d1f301'
- 'ec323d1ea8372afa236ed82d1f38bf62'
- '04985b1bb7a7255970de1c9a0d6b6c37'
- '143d16162ded3cf1ed99731e0ccd4cbc'
- 'ec04abda3d2eafd5cccad44b843d2191'
- 'a1273c8ba22f38f0304d44f52095541d'
- '06ff7794da97ef3cad3ccfde2a229db3'
- 'bb873b67b1e65eccf186622c1315e14b'
- '87ea24ef462fed8a3f6e74e25b210607'
- 'c7363deffa336c8470884ca7500ff583'
- '64d7b4490bbe3cdb25cc8633d46761d4'
- '1bc28fd43fbe54185e0f34161e2bb856'
- 'f90cedcac1daa1a7be9abc9a960bbde0'
- '326a063d3b5d0aff735a145dcbb51e01'
- '86ff061d2346b75b85e59374328d20f8'
- '83969caa207fa30dd016fee6bd2aa543'
- '68d50a5c356d62514bfa99b04776ed7c'
- 'f5ffaa9dc1da2412faf78a4920d19278'
- 'a76518ba680a2fc263de99099e0e1c53'
- 'e88f3c95cf4e51035429307f4f6a4eb5'
- 'c2573d6f463cdd69f6b37612f9ae997a'
- '8b17220cd897ea744978752b2ef11ab0'
- '4ee8b3d2e4fd7bf3353a910d76cbbaf8'
- 'f87d295343ecf5b1e21abe430b157c42'
- '74ce04669c8acf87a8b8878fb2653dc4'
- '5ffc16a8c701c8c2c133775a815d1e67'
- '6d6c1a7e31bf6301ee690509881a4395'
- '41c970fd7ef2224a63de7d562ce71b39'
- 'a4243831934d31aad648221190fe2b42'
- '6c1c023d67a35e4ed3a792bb365f360e'
- '0045f4bceaaddd57fa6c0b895a34feff'
- '18b359d881127defff20e549bb0c5b80'
- 'a295fbd180dfe3e009218aa2775ce332'
- '6beaeaf5bf67321fdef0ee6de968edaa'
- '92b29bc95a476d9cb75c5df075f353b9'
- 'fa757024edb1f1f794f77ecee8c07706'
- '8f21adb897625a2a27a040a8e88bed3f'
- '26b5ab6bb93b454702179c48c9da2e5b'
- 'f319345cdc962919830792644c66165d'
- '7f32885e485beab6822eb9ec0025bae7'
- 'edf019e6332d099d67b68f1f90da680c'
- 'e21836a77f143457ac7912ee0e6386dc'
- '24adc86b3fb496f3d27944a5027d5fa9'
- '7192e7c7d80cc8eb85e1f57defa0496c'
- 'f449ced45bb084ce0adda6df89b1ee31'
- '25e3ce79fc2c1e2164ce04821e683a29'
- '615138d3ed86797a168a0d5784f0c6fe'
- '7c83196da5ee2d01444450cca620c29d'
- '265f8447eee6e6b41ab8fdcf1a1dc154'
- '9889d38b50a7e2d095582ebf75cab9e2'
- '12b882986056bca65fdfc90806daf87b')
+md5sums=('15ededc2d92b095297c32682b1ea5556'
+ '21b066c8006bd37843873a0950b4dd17'
+ 'c531b388e48a2b964091cdabdc6ea843'
+ '02dd4a828cd62d3704b329cc0269c754'
+ 'aa058920d2e9e590a5f43371ec0c758a'
+ 'd2f6d97e73956b929812efc26cbb8a00'
+ '422ba52f874f376d97a74c79047bb07e'
+ 'ebc329dbdfd9533f237731f4ab13c0c7'
+ '372f5b371ef045fd9b1d87d0f5a02f1b'
+ 'f4833810e478a319360b144d1e4e5dd0'
+ 'dcd04ada6fc38908cd1a0b4c640d49b6'
+ 'f5805071746aaac4c977dc6104d81524'
+ '55fb0a3581661c71e8a8b4fdaa5f92c6'
+ 'f4f24e1b0a53d0dca2b8bef384173682'
+ '3beb64fc06de87f5b70f2ba08ab3359e'
+ '62d4a011ccdfdf4f24063caec6e881b2'
+ '230373349ab450147ff19f4afebde2ea'
+ 'c7eff1f39bf536a4da476d77a3e0a450'
+ '06a7c3143b493c96628e93a58f25550c'
+ '5017bdacb7ee1430fa73b9b7ca657497'
+ 'c7aa6657da6f2cd9dc90c323c6676bf9'
+ 'ee9a365773d95e7c31de8089aef0d847'
+ 'feebccca9f6eec21b81e26e1804b0140'
+ '65339aa37592def5a0fa6e5aaf416de5'
+ '64980f1186f4045574babcde77f11529'
+ '20f25644314ad2801db9156531ea290c'
+ 'fd7c8318ab9d946a49ef2873de0d8e0a'
+ 'd6612e0b47375fdb34341ed8386a621f'
+ '89295ed1c51be054d571609209641fa1'
+ 'b35e49dc04bf9134262ae7db57b0311b'
+ '15487ee85959928fa0b85fe99e3c7a82'
+ 'ed555ce92aa37545b4f62ea4bdca9187'
+ '5d83088d4bcd042acfecbb0a85215548'
+ '1f1a513aac9b1d3cbc6dce3e948c33ca'
+ '1b955a8dd7690991d06ced05fc2f1fae'
+ '1785e4bb27d71cc0226eab506f81669a'
+ 'fd9a007c75b8738f3b2e167087655526'
+ '6578b879762db29b40e1723ba59043d6'
+ 'afe8fff2c2707724d2ef5536180a0907'
+ 'b8befd7b5e781403c3c0797633f0f92b'
+ '2097f7218575732e448662b3d1d1a351'
+ '82c29288a115668f25d01d0e7175419f'
+ '8398d4a711dd73302b790a2b99d9e78f'
+ '1ed5155cd7f3be98b25d94a126d043bb'
+ '899f04c2629e648be0f32f1ec04b9b56'
+ '4af5b8985fdb1858c0c25b8452ca72fc'
+ '43189f0ad649e00cedc608c6197a6426'
+ 'aeed4c0b7e536c0b4f9b36a5dc3d1d63'
+ 'a8bbc0c2acf8defcf9c200cacd243536'
+ '9c35cfcbf9d66aa42abfaae4aa4a6937'
+ 'b19268362d73d7e3f66ff7f7f21ab6bd'
+ 'c45de9ad905bbdda655227e77b09a1ba'
+ '430bb7d6dc4037666fb452e5c2c03c83'
+ '6280326bb1fb7c2ddd5c3b5a5360651b'
+ '571688d2bce6597ae76a7ead8929420c')
--
cgit v1.2.3-54-g00ecf
From deb087a59a1830fbabd4c8aa072871be124aebba Mon Sep 17 00:00:00 2001
From: André Fabian Silva Delgado
Date: Mon, 26 Nov 2012 19:34:40 -0200
Subject: linux-libre-grsec-3.6.7-5: updating revision due that grsec patch was
updated
---
kernels/linux-libre-grsec/PKGBUILD | 10 +++++-----
kernels/linux-libre-grsec/config.i686 | 1 +
kernels/linux-libre-grsec/config.x86_64 | 3 ++-
3 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/kernels/linux-libre-grsec/PKGBUILD b/kernels/linux-libre-grsec/PKGBUILD
index c0f1eb2a9..34eb84ed2 100755
--- a/kernels/linux-libre-grsec/PKGBUILD
+++ b/kernels/linux-libre-grsec/PKGBUILD
@@ -11,9 +11,9 @@ pkgbase=linux-libre-grsec # Build stock -LIBRE-GRSEC kernel
_basekernel=3.6
_sublevel=7
_grsecver=2.9.1
-_timestamp=201211221000
+_timestamp=201211251900
pkgver=${_basekernel}.${_sublevel}
-pkgrel=4
+pkgrel=5
_lxopkgver=${_basekernel}.7 # nearly always the same as pkgver
arch=('i686' 'x86_64' 'mips64el')
url="http://linux-libre.fsfla.org/"
@@ -37,9 +37,9 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn
"http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/debuginfo/linux-patches-${_lxopkgver}-gnu_0loongsonlibre_mipsel.tar.bz2")
md5sums=('a2312edd0265b5b07bd4b50afae2b380'
'a4e642180c7d757a642175fe32e4a264'
- '25ad4a2c727ae5d0fcfe30008a6cce09'
- '508ce60a46a36c65d847c4759ac5f6c7'
- 'e0df7f5866d6d74ecc339347ac58ea3b'
+ 'a56e5d5ab9dd0f44677aa61466046ce6'
+ '9b4ec887671d9242eba16be5cba4f9dc'
+ '55695d7853abe483f4db189877fd5e36'
'5f66bed97a5c37e48eb2f71b2d354b9a'
'2967cecc3af9f954ccc822fd63dca6ff'
'8267264d9a8966e57fdacd1fa1fc65c4'
diff --git a/kernels/linux-libre-grsec/config.i686 b/kernels/linux-libre-grsec/config.i686
index 4d43f6702..cd4caf51b 100644
--- a/kernels/linux-libre-grsec/config.i686
+++ b/kernels/linux-libre-grsec/config.i686
@@ -5845,6 +5845,7 @@ CONFIG_PAX_USERCOPY=y
CONFIG_GRKERNSEC_KMEM=y
CONFIG_GRKERNSEC_VM86=y
# CONFIG_GRKERNSEC_IO is not set
+CONFIG_GRKERNSEC_JIT_HARDEN=y
CONFIG_GRKERNSEC_PROC_MEMMAP=y
CONFIG_GRKERNSEC_BRUTE=y
CONFIG_GRKERNSEC_MODHARDEN=y
diff --git a/kernels/linux-libre-grsec/config.x86_64 b/kernels/linux-libre-grsec/config.x86_64
index c1729bff5..2652b500b 100644
--- a/kernels/linux-libre-grsec/config.x86_64
+++ b/kernels/linux-libre-grsec/config.x86_64
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/x86_64 3.6.7-4 Kernel Configuration
+# Linux/x86_64 3.6.1-2 Kernel Configuration
#
CONFIG_64BIT=y
# CONFIG_X86_32 is not set
@@ -5691,6 +5691,7 @@ CONFIG_GRKERNSEC_BLACKHOLE=y
# Sysctl Support
#
CONFIG_GRKERNSEC_SYSCTL=y
+# CONFIG_GRKERNSEC_SYSCTL_DISTRO is not set
CONFIG_GRKERNSEC_SYSCTL_ON=y
#
--
cgit v1.2.3-54-g00ecf
From cbe32391ae509d6dbfd78a1a438b65dd291a7e42 Mon Sep 17 00:00:00 2001
From: André Fabian Silva Delgado
Date: Mon, 26 Nov 2012 22:26:59 -0200
Subject: linux-libre-rt-3.6.7_rt18-1: updating version
---
kernels/linux-libre-rt/PKGBUILD | 17 +++++++++++------
kernels/linux-libre-rt/irq_cfg_pointer-3.6.6.patch | 16 ++++++++++++++++
kernels/linux-libre-rt/linux-libre-rt.install | 2 +-
3 files changed, 28 insertions(+), 7 deletions(-)
create mode 100644 kernels/linux-libre-rt/irq_cfg_pointer-3.6.6.patch
diff --git a/kernels/linux-libre-rt/PKGBUILD b/kernels/linux-libre-rt/PKGBUILD
index 30361d313..32a69fba2 100755
--- a/kernels/linux-libre-rt/PKGBUILD
+++ b/kernels/linux-libre-rt/PKGBUILD
@@ -11,12 +11,12 @@
pkgbase=linux-libre-rt # Build stock -LIBRE-RT kernel
#pkgbase=linux-libre-custom # Build kernel with a different name
_basekernel=3.6
-_releasever=6
-_rtpatchver=rt17
+_releasever=7
+_rtpatchver=rt18
_pkgver=${_basekernel}.${_releasever}
pkgver=${_basekernel}.${_releasever}_${_rtpatchver}
pkgrel=1
-_lxopkgver=${_basekernel}.6 # nearly always the same as pkgver
+_lxopkgver=${_basekernel}.7 # nearly always the same as pkgver
arch=('i686' 'x86_64' 'mips64el')
url="http://linux-libre.fsfla.org/"
license=('GPL2')
@@ -35,10 +35,11 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn
'change-default-console-loglevel.patch'
'module-symbol-waiting-3.6.patch'
'module-init-wait-3.6.patch'
+ 'irq_cfg_pointer-3.6.6.patch'
"http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/debuginfo/linux-patches-${_lxopkgver}-gnu_0loongsonlibre_mipsel.tar.bz2")
md5sums=('a2312edd0265b5b07bd4b50afae2b380'
- '887e4a0fd0fb10da9410f5d1a75466b8'
- '20cd3b6ed53047a633d1e2b1ba32973e'
+ 'a4e642180c7d757a642175fe32e4a264'
+ '01f97c0630de43763699d580f48e1c74'
'11161582d9050710ccfecbe077fc5a63'
'ac8f20b0cd83acb9525b5557e1fafeaf'
'82496e68851d1960543a07ba51cdb44a'
@@ -48,7 +49,8 @@ md5sums=('a2312edd0265b5b07bd4b50afae2b380'
'9d3c56a4b999c8bfbd4018089a62f662'
'670931649c60fcb3ef2e0119ed532bd4'
'8a71abc4224f575008f974a099b5cf6f'
- 'a281ee5d89a016d72840bddb2d742635')
+ '4909a0271af4e5f373136b382826717f'
+ '1dd80f353c705fef988346a8ef05d13f')
if [ "$CARCH" != "mips64el" ]; then
# Don't use the Loongson-specific patches on non-mips64el arches.
unset source[${#source[@]}-1]
@@ -81,6 +83,9 @@ build() {
patch -Np1 -i "${srcdir}/module-symbol-waiting-3.6.patch"
patch -Np1 -i "${srcdir}/module-init-wait-3.6.patch"
+ # fix FS#32615 - Check for valid irq_cfg pointer in smp_irq_move_cleanup_interrupt
+ patch -Np1 -i "${srcdir}/irq_cfg_pointer-3.6.6.patch"
+
if [ "$CARCH" == "mips64el" ]; then
sed -i "s|^EXTRAVERSION.*|EXTRAVERSION =-libre-rt|" Makefile
sed -r "s|^( SUBLEVEL = ).*|\1$_sublevel|" \
diff --git a/kernels/linux-libre-rt/irq_cfg_pointer-3.6.6.patch b/kernels/linux-libre-rt/irq_cfg_pointer-3.6.6.patch
new file mode 100644
index 000000000..32583c0ac
--- /dev/null
+++ b/kernels/linux-libre-rt/irq_cfg_pointer-3.6.6.patch
@@ -0,0 +1,16 @@
+X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux.git;a=blobdiff_plain;f=arch%2Fx86%2Fkernel%2Fapic%2Fio_apic.c;h=1817fa911024f07151d3edf91bd350722c9f79f8;hp=c265593ec2cdc3df35fda1586aaf91514fab62fa;hb=94777fc51b3ad85ff9f705ddf7cdd0eb3bbad5a6;hpb=3e8fa263a97079c74880675c451587bb6899e661
+
+diff --git a/arch/x86/kernel/apic/io_apic.c b/arch/x86/kernel/apic/io_apic.c
+index c265593..1817fa9 100644
+--- a/arch/x86/kernel/apic/io_apic.c
++++ b/arch/x86/kernel/apic/io_apic.c
+@@ -2257,6 +2257,9 @@ asmlinkage void smp_irq_move_cleanup_interrupt(void)
+ continue;
+
+ cfg = irq_cfg(irq);
++ if (!cfg)
++ continue;
++
+ raw_spin_lock(&desc->lock);
+
+ /*
diff --git a/kernels/linux-libre-rt/linux-libre-rt.install b/kernels/linux-libre-rt/linux-libre-rt.install
index c7a44aeee..7925ec89c 100755
--- a/kernels/linux-libre-rt/linux-libre-rt.install
+++ b/kernels/linux-libre-rt/linux-libre-rt.install
@@ -2,7 +2,7 @@
# arg 2: the old package version
KERNEL_NAME=-rt
-KERNEL_VERSION=3.6.6-1-rt17-LIBRE-RT
+KERNEL_VERSION=3.6.7-1-rt18-LIBRE-RT
# set a sane PATH to ensure that critical utils like depmod will be found
export PATH='/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin'
--
cgit v1.2.3-54-g00ecf
From b1c14cd929ca53e06945a5cda3965dc6fcd9d6b7 Mon Sep 17 00:00:00 2001
From: André Fabian Silva Delgado
Date: Mon, 26 Nov 2012 22:34:08 -0200
Subject: linux-libre-lts-rt-3.0.52_rt76-1: updating version
---
kernels/linux-libre-lts-rt/PKGBUILD | 12 ++++++------
kernels/linux-libre-lts-rt/linux-libre-lts-rt.install | 2 +-
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/kernels/linux-libre-lts-rt/PKGBUILD b/kernels/linux-libre-lts-rt/PKGBUILD
index 976b2995c..b426568ed 100755
--- a/kernels/linux-libre-lts-rt/PKGBUILD
+++ b/kernels/linux-libre-lts-rt/PKGBUILD
@@ -11,12 +11,12 @@
pkgbase=linux-libre-lts-rt # Build stock -LIBRE-LTS-RT kernel
#pkgbase=linux-libre-custom # Build kernel with a different name
_basekernel=3.0
-_releasever=51
-_rtpatchver=rt75
+_releasever=52
+_rtpatchver=rt76
_pkgver=${_basekernel}.${_releasever}
pkgver=${_basekernel}.${_releasever}_${_rtpatchver}
pkgrel=1
-_lxopkgver=${_basekernel}.50 # nearly always the same as pkgver
+_lxopkgver=${_basekernel}.52 # nearly always the same as pkgver
arch=('i686' 'x86_64' 'mips64el')
url="http://linux-libre.fsfla.org/"
license=('GPL2')
@@ -39,8 +39,8 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn
'module-init-wait-3.0.patch'
"http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/debuginfo/linux-patches-${_lxopkgver}-gnu_0loongsonlibre_mipsel.tar.bz2")
md5sums=('5f64180fe7df4e574dac5911b78f5067'
- 'fb3c742b1f8b01131534a22348cfa712'
- '904669e437a0bb19e95022964430ad4a'
+ '41adc30b96b745f08899317da83f7eaa'
+ 'a2b53a39e1a4b4103f91609b3d285591'
'7266f5e7af09cc6e4b15d7a952e3b350'
'5387f0cf51652c071190789569adf9c7'
'85f04a9555bdc295f7c387a6564f0c81'
@@ -52,7 +52,7 @@ md5sums=('5f64180fe7df4e574dac5911b78f5067'
'f36222e7ce20c8e4dc27376f9be60f6c'
'670931649c60fcb3ef2e0119ed532bd4'
'8a71abc4224f575008f974a099b5cf6f'
- 'e2cc9f33fb26b254b6b65f8981aebf13')
+ 'ecf9d21d2d6dfbc29dc18b616cbce4e1')
if [ "$CARCH" != "mips64el" ]; then
# Don't use the Loongson-specific patches on non-mips64el arches.
unset source[${#source[@]}-1]
diff --git a/kernels/linux-libre-lts-rt/linux-libre-lts-rt.install b/kernels/linux-libre-lts-rt/linux-libre-lts-rt.install
index 5f31cc3d4..98e85eeaf 100755
--- a/kernels/linux-libre-lts-rt/linux-libre-lts-rt.install
+++ b/kernels/linux-libre-lts-rt/linux-libre-lts-rt.install
@@ -2,7 +2,7 @@
# arg 2: the old package version
KERNEL_NAME=-lts-rt
-KERNEL_VERSION=3.0.51-1-rt75-LIBRE-LTS-RT
+KERNEL_VERSION=3.0.52-1-rt76-LIBRE-LTS-RT
# set a sane PATH to ensure that critical utils like depmod will be found
export PATH='/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin'
--
cgit v1.2.3-54-g00ecf
From 34b4025bc7b0c6d8d47988decd140df38b1d98ac Mon Sep 17 00:00:00 2001
From: Luke Shumaker
Date: Mon, 26 Nov 2012 23:50:48 -0500
Subject: update libre/mozilla-searchplugins
* add duckduckgo html
* fix jamendo
* remove logless-search
* use the site's xml files when possible
---
libre/mozilla-searchplugins/PKGBUILD | 35 ++++++++++++++---------
libre/mozilla-searchplugins/duck-duck-go-lite.xml | 8 ------
libre/mozilla-searchplugins/internet-archive.xml | 0
libre/mozilla-searchplugins/jamendo-en.xml | 12 --------
libre/mozilla-searchplugins/jamendo-en.xml.in | 10 +++++++
libre/mozilla-searchplugins/logless-search.xml | 8 ------
libre/mozilla-searchplugins/parabola-packages.xml | 0
libre/mozilla-searchplugins/parabola-wiki-en.xml | 0
libre/mozilla-searchplugins/seeks-search.xml | 8 ------
libre/mozilla-searchplugins/wikipedia.xml | 15 ----------
libre/mozilla-searchplugins/yacy.xml | 9 ------
11 files changed, 31 insertions(+), 74 deletions(-)
mode change 100755 => 100644 libre/mozilla-searchplugins/PKGBUILD
delete mode 100755 libre/mozilla-searchplugins/duck-duck-go-lite.xml
mode change 100755 => 100644 libre/mozilla-searchplugins/internet-archive.xml
delete mode 100755 libre/mozilla-searchplugins/jamendo-en.xml
create mode 100644 libre/mozilla-searchplugins/jamendo-en.xml.in
delete mode 100755 libre/mozilla-searchplugins/logless-search.xml
mode change 100755 => 100644 libre/mozilla-searchplugins/parabola-packages.xml
mode change 100755 => 100644 libre/mozilla-searchplugins/parabola-wiki-en.xml
delete mode 100755 libre/mozilla-searchplugins/seeks-search.xml
delete mode 100755 libre/mozilla-searchplugins/wikipedia.xml
delete mode 100755 libre/mozilla-searchplugins/yacy.xml
diff --git a/libre/mozilla-searchplugins/PKGBUILD b/libre/mozilla-searchplugins/PKGBUILD
old mode 100755
new mode 100644
index 288ce698d..11635526e
--- a/libre/mozilla-searchplugins/PKGBUILD
+++ b/libre/mozilla-searchplugins/PKGBUILD
@@ -9,35 +9,42 @@
# Contributor: Muhammad 'MJ' Jassim
pkgname=mozilla-searchplugins
-pkgver=1.2
-pkgrel=3
+pkgver=1.3
+pkgrel=1
pkgdesc="System-wide OpenSearch plugins common for Mozilla based browsers."
arch=('any')
license=('MPL' 'GPL' 'LGPL')
url="https://parabolagnulinux.org/"
source=(
- duck-duck-go-lite.xml
+ duckduckgo-html.xml::https://duckduckgo.com/opensearch_html.xml
+ duckduckgo-lite.xml::https://duckduckgo.com/opensearch_lite.xml
internet-archive.xml
- jamendo-en.xml
- logless-search.xml
+ jamendo-en.xml.in
+ jamendo.ico::http://www.jamendo.com/favicon.ico
parabola-packages.xml
parabola-wiki-en.xml
- seeks-search.xml
- wikipedia.xml
- yacy.xml
+ seeks-search.xml::http://www.seeks-project.info/search.php/opensearch.xml
+ yacybluebox.xml::http://yacy.dyndns.org:8000/opensearchdescription.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"
}
-md5sums=('e1bda0854de7d764f7401c81bb82b5ef'
+md5sums=('fde80774b91b3aba358d587c65139727'
+ 'd19e22a8e1e663905fb1ead60abd2a5d'
'462c68585461f8cdc23c93c46f6ee4cf'
- '2d492295c4308f9bba9ece28d8b3af2d'
- '937ac0e5392b060d93bd33e761fbfa51'
+ '0c9a3f48971aab8aa0cf2f5e2ff67292'
+ 'e50a847cec81357e8730e0d327515a9c'
'3c4a7f901bfe9000a702c68f7f78428c'
'5bf9ca2558026fa3f4ec52d8e64fee47'
- '86ccb1d02683e69e6bc0543cb77a06bc'
- 'c35f4971feff8387e0570d7a165eb6fa'
- '24528ca3f7f1e1a0ba735231aa3ac1de')
+ '3c68938db88b6ea552742718a08f3bf8'
+ 'bdb2640c643493063051bc72eeeff920'
+ 'cb281f07933210c812a6153f32109645')
diff --git a/libre/mozilla-searchplugins/duck-duck-go-lite.xml b/libre/mozilla-searchplugins/duck-duck-go-lite.xml
deleted file mode 100755
index 3142d3410..000000000
--- a/libre/mozilla-searchplugins/duck-duck-go-lite.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-Duck Duck Go (Lite)
-Search Duck Duck Go (Lite)
-UTF-8
-data:image/x-icon;base64,AAABAAEAEBAAAAEAIABoBAAAFgAAACgAAAAQAAAAIAAAAAEAIAAAAAAAAAAAANcNAADXDQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAJyDsJmlk8pf6+v3s/v7+++zr/fcnIOyzJyDsgCcg7CYAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAnIOwBJyDscCcg7PZttJ7/7Pfs//////++xO7/S5GA/ycg7P8nIOz2JyDscCcg7AEAAAAAAAAAAAAAAAAnIOwBJyDstScg7P8nIOz/Y8p5/2fHZf9Yv0z/YcF2/1rBUv8nIOz/JyDs/ycg7P8nIOy1JyDsAQAAAAAAAAAAJyDscCcg7P8nIOz/JyDs/4jQoP/p9+n//////05X3v9LkYD/JyDs/ycg7P8nIOz/JyDs/ycg7HAAAAAAJyDsJicg7PYnIOz/JyDs/zUu7f/+/v////////////89N+7/JyDs/yUo7f8nIOz/JyDs/ycg7P8nIOz2JyDsJicg7IAnIOz/JyDs/ycg7P9hXPH////////////t/P//GIr2/wfD+/8Gyfz/DKv5/yM57/8nIOz/JyDs/ycg7H8nIOyzJyDs/ycg7P8nIOz/jov1////////////Otz9/w3G/P8cWfH/JSvt/ycg7P8nIOz/JyDs/ycg7P8nIOyzJyDs5icg7P8nIOz/JyDs/7u5+f///////////27l/v8E0v3/BNL9/wTQ/f8Oofn/IT7v/ycg7P8nIOz/JyDs5icg7OYnIOz/JyDs/ycg7P/p6P3/uWsC////////////5fr//6Po/f8Thfb/DKv5/w6f+f8nIOz/JyDs/ycg7OYnIOyzJyDs/ycg7P8nIOz/9/b+/////////////////7lrAv/V1Pv/JyDs/ycg7P8nIOz/JyDs/ycg7P8nIOyzJyDsgCcg7P8nIOz/JyDs/8/N+///////////////////////iIX1/ycg7P8nIOz/JyDs/ycg7P8nIOz/JyDsfycg7CYnIOz2JyDs/ycg7P9FP+7/q6n4/+7u/f/n5v3/fXn0/yoj7P8nIOz/JyDs/ycg7P8nIOz/JyDs9icg7CYAAAAAJyDscCcg7P8nIOz/wsD6/+no/f/Y1/z/eHTz/ycg7P8nIOz/JyDs/ycg7P8nIOz/JyDs/ycg7HAAAAAAAAAAACcg7AEnIOy1JyDs/ycg7P8nIOz/JyDs/ycg7P8nIOz/JyDs/ycg7P8nIOz/JyDs/ycg7LUnIOwBAAAAAAAAAAAAAAAAJyDsAScg7HAnIOz2JyDs/ycg7P8nIOz/JyDs/ycg7P8nIOz/JyDs9icg7HAnIOwBAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAJyDsJicg7IAnIOyzJyDs5icg7OYnIOyzJyDsgCcg7CYAAAAAAAAAAAAAAAAAAAAA+B8AAPAPAADAAwAAwAMAAIABAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAABAACAAQAAwAMAAMADAADwDwAA+B8AAA==
-
-
-
\ No newline at end of file
diff --git a/libre/mozilla-searchplugins/internet-archive.xml b/libre/mozilla-searchplugins/internet-archive.xml
old mode 100755
new mode 100644
diff --git a/libre/mozilla-searchplugins/jamendo-en.xml b/libre/mozilla-searchplugins/jamendo-en.xml
deleted file mode 100755
index 91d6df6e4..000000000
--- a/libre/mozilla-searchplugins/jamendo-en.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-Jamendo (en)
-Search Jamendo.com English site for downloadable Creative Commons music
-UTF-8
-data:image/x-icon;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAABh0RVh0U29mdHdhcmUAUGFpbnQuTkVUIHYzLjMxN4N3hgAAAqZJREFUOE9tk21IU2EUx+9S+tAXbZt6J4GRkEFQEQsKsb7W1ySCoK+9iCK9WKvMlZmKI8jqgw0JS52ZpQ4D7RV6IUmIqVGjgl6md0uf3dmcq3nvdv+dezfvNHvgD889z/n/zrn33MfApZfhpSMnu2hN5sGMFVzzori+jUk4nplhuMUfCISXnQc6+VJ21+INdluQFP+PFuKWjz9u8/sWAwz+Tn4nmVjabIF4vwChviKIvesh9hSkoDpEzS3RIGS20kN4wRxyb0b0fRNk0YNEVCD5ILMRREcvaLBkZxro11SXxcpNd1ladPPAVkjCYygJCSH/DEJCCIqiQF1KYh6xry6CbNAhVLyK09u+l0+VGylTRiKeQG9dP5xlTvi8E2lIPIbIyDH9daj4eArAQ21dDr7TqsWlONpPtMO23Yb6/Q3wvvVqcXVJ/mcQHxTqEI51WcBceZh5WILE3IQO6KjqgG3HGVRYK1G15zRGX49pncjiGEL9W8jDQ/VyrI02bXn0xYsRj/iWA7ZVoqy4HE+6nyYBzAOxe5PmUb0cc+aC3cyFeGcjpMBIGnCSOqBXqN1bhzcDw5AlWTub/zYE1lqgeVQvx67ngDWTruVi7pUdoAnE5QT66t1wnXNB+OKnCaQmIc1hdvAQ5ZuTHvJyP6+YW5iDAg4TxBtFiH3ogSL9gegPIxKK0lTUGSpQ5iP4PdyM4FWqTrnkkScd5iZOuGy2sjpzmF2iICnYtBaRIRukz4OIB8YhCx6CujHrLgerp++VyhNqTU76Dw3a3+irNu6atpuCJGg6n0WJ+WCNhWAN68BqeS22cD5ZbWq9uHvVyiX3Qag2lU7ZTV4dYjdiuiYldZ+CU17P88NZq/93W7lPp4xZlFiRhqQ6IvP3s8ZHUzWmIy+OZi8x/wVGO4LYiOwxygAAAABJRU5ErkJggg==
-7
-http://mycroft.mozdev.org/updateos.php/id0/jamendo.xml
-http://mycroft.mozdev.org/updateos.php/id0/jamendo.ico
-http://www.jamendo.com/en
-
-
-
\ No newline at end of file
diff --git a/libre/mozilla-searchplugins/jamendo-en.xml.in b/libre/mozilla-searchplugins/jamendo-en.xml.in
new file mode 100644
index 000000000..96b3a008d
--- /dev/null
+++ b/libre/mozilla-searchplugins/jamendo-en.xml.in
@@ -0,0 +1,10 @@
+
+Jamendo (en)
+Search Jamendo.com English site for downloadable Creative Commons music
+UTF-8
+data:image/x-icon;base64,@icon@
+http://mycroft.mozdev.org/updateos.php/id0/jamendo.xml
+http://www.jamendo.com/en
+
+
+
diff --git a/libre/mozilla-searchplugins/logless-search.xml b/libre/mozilla-searchplugins/logless-search.xml
deleted file mode 100755
index 1538d1ef0..000000000
--- a/libre/mozilla-searchplugins/logless-search.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-Logless Search
-Use logless.com to search the Internet in privacy, with no search logs.
-UTF-8
-data:image/x-icon;base64,AAABAAEAEBAAAAEAGABoAwAAFgAAACgAAAAQAAAAIAAAAAEAGAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABKo4NSnYdKl4FmtZ52uKdKb2cjQDwQKzoSMS1Ka2lzqJRlt51VmI5MgnVHk4BpoJRPoohMiXZUo4xctJteoZAmT00jPUEYLzoRSToxVVdhhYJ/saCXgnS1cWKykH+KoptfjoBDempaoo5dtZdViXw9TFsuOkghMjoYVVIvTlded36Vm5Lol4X5lIPQlImft62IhnpTfXGMtqxquaJSkYU5Qlk6OFE+SFwzV3dLVW1teoNvo5SPppSNoJR4mJZ7uqhyj3xbg3iGuK1btZxQm4pHSmFHOV48RWhFOWpbRXFgd4BSq5JHqJJQrplprp95uqdVj3xTi3xZsptauphfqZRLRWA/LFozMVhGGEhYOmdUgIJIqo5EqJBPr5ZbspxuuqU7fWNakXpjqY9kvJxhuZ5RYGUvMEgvFSchID9ZM1JMbG1HrpZGpo1QnYZaoJJXpZI0dFqKk3m+mISen4ieln2BPTJuGxeIGhNrFRKHEQ2VLiOCa1xsnIhaf39tlJN6rKVFc1+bmH/vloDshW7oZE+wLR+7MBvHMButJRK9MibhUzzkVj7eXUTBa2yOkYuMuaMtQDS1iHP0gWrpel3dZUnIZEnbWT3aPyXkX0T/k3v0WkD6alH3clv4c1bweGDloIdlSD/ZeWXWdl/sdlvvc1jpe2Pvc1fqUzrudl38hG33aE38dVv8j3f5lXz/inLro42JZluAY13YcGDxgGb1hWj3f2f+iWv0cFT8sZH8kXj7fGP6fGH2e2D/mH/oqY7Vr5pIV1WiY1fYeWbMgHPklXnuj3T9jGr9mXj8nH/7jnT7lHv8knb6kHD/j3S/uZujw7NeXGSWXFSNbGbDi4e6p5HZnYb6kXP6nYP7l4D4qI/irpjaq5D/o4r3o4jZtJu0u7FRRlNpTFyEXWaygnmsrKGprp7SqpXno5X1rJf1wazLuqTQr5rqrKDXuKXbtaDGt6w7ITVQLUaEdHqwu7KpvLOArJ+VpZ+3oqCoqp/App7YnpDimIy2qJ20r6S1r6WhuasAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-
-
-
diff --git a/libre/mozilla-searchplugins/parabola-packages.xml b/libre/mozilla-searchplugins/parabola-packages.xml
old mode 100755
new mode 100644
diff --git a/libre/mozilla-searchplugins/parabola-wiki-en.xml b/libre/mozilla-searchplugins/parabola-wiki-en.xml
old mode 100755
new mode 100644
diff --git a/libre/mozilla-searchplugins/seeks-search.xml b/libre/mozilla-searchplugins/seeks-search.xml
deleted file mode 100755
index 5025f5a06..000000000
--- a/libre/mozilla-searchplugins/seeks-search.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-Seeks Search
-Real-time p2p pattern matching network for social websearch.
-UTF-8
-data:image/x-icon;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABHNCSVQICAgIfAhkiAAAAAlwSFlzAAAAwwAAAMMBnc7+MwAAABl0RVh0U29mdHdhcmUAd3d3Lmlua3NjYXBlLm9yZ5vuPBoAAAJCSURBVDiNpZJLSFRxGMV/f2fGGWcc8zI6U5qSmmVPyIW0kURoES1CMgODwgh72yZoU1EQRItMooLQLAiLBAsiaVGRBKFID0oqMpqy0UIdnWke1zuPe/8tNHtAwdTZfHyc75zDB0dUtiiXgAZAkBokcFlUtigyReEvSPsf8T8ZSAkYP3bz3w6TGiQ00OMgDTCM6QmQZgKr4zcDaUA8CnEN9NhM2h9g6KDrPxloIYiFp1NSgdnQIToBpTkrqaneQp5SyIexd1x/3MrngA+AEs9ialdvo8BVxJDfS2dvO0Pj76cdyg8r8lBHo0zqCflVDci+wR6pxqIyooXl1nPr5P72ehlLaDKkBmXvYI+MaGGpxafkrtZaWX5UkaLqRLG8c/AFL4eesLutDt1IkpFu51rTPWyWDBw2J97Rt+y4WENST2C12Liyp5u52fmsb16BeWneKhzWTFzOXNp23pr9zWJKZ75rAQBz7AqtjTdnOXu6gxynm1LPcsxqTKWr7yoIgfjeZgE2SwZqLIoQgshUmOHJTzOUYCTgY8D3jGQiifmptw+HSaGitJK2B2eYCI8zTyngZP0Fnnv7sVszmYqrNN8+xkR4nHxXIdurD/BwoJs3wwOYpQ6ByCQl7jKObDxNSA3icrpRY1HO3z1FliObhqp9HK87iz88hiszF7PJgj/kx9BBLGlSpJGEIs9C1ixbS5FnEaPBEbp6OxgNfgGgMLeYDRWbyclyMzjyikev7+Pzf8RkAVG2V+mUkk2p1QeQINK48Q3fpPIi5xKaPwAAAABJRU5ErkJggg==
-
-
-
\ No newline at end of file
diff --git a/libre/mozilla-searchplugins/wikipedia.xml b/libre/mozilla-searchplugins/wikipedia.xml
deleted file mode 100755
index 36b8ed494..000000000
--- a/libre/mozilla-searchplugins/wikipedia.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-
-Wikipedia (en)
-Wikipedia, the free encyclopedia
-UTF-8
-data:image/x-icon;base64,AAABAAEAEBAQAAEABAAoAQAAFgAAACgAAAAQAAAAIAAAAAEABAAAAAAAAAAAAAAAAAAAAAAAEAAAAAAAAAAEAgQAhIOEAMjHyABIR0gA6ejpAGlqaQCpqKkAKCgoAPz9%2FAAZGBkAmJiYANjZ2ABXWFcAent6ALm6uQA8OjwAiIiIiIiIiIiIiI4oiL6IiIiIgzuIV4iIiIhndo53KIiIiB%2FWvXoYiIiIfEZfWBSIiIEGi%2FfoqoiIgzuL84i9iIjpGIoMiEHoiMkos3FojmiLlUipYliEWIF%2BiDe0GoRa7D6GPbjcu1yIiIiIiIiIiIiIiIiIiIiIiIiIiIiIiIgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-
-
-
-
-
-
-
-
-http://en.wikipedia.org/wiki/Special:Search
-
diff --git a/libre/mozilla-searchplugins/yacy.xml b/libre/mozilla-searchplugins/yacy.xml
deleted file mode 100755
index 61201ad20..000000000
--- a/libre/mozilla-searchplugins/yacy.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-YaCy
-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 'kupferhammer-keller'.
-UTF-8
-data:image/x-icon,%00%00%01%00%01%00%10%10%00%00%01%00%18%00h%2B%00%00%16%00%00%00(%00%00%00%10%00%00%00%20%00%00%00%01%00%18%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%CE%BD%7B%DE%CE%9C%8CkRkJ1kJ1kJ1kJ1kJ1sR9%C6%B5%9C%E7%DE%BD%E7%DE%BD%E7%DE%C6%E7%DE%C6%EF%EF%CE%DE%DE%AD%DE%CE%9C%BD%ADs%7BZ)%BD%ADk%CE%BD%7B%CE%BD%7B%CE%BD%7B%CE%BD%7B%A5%8CJ%8CkB%CE%BD%84%CE%BD%84%CE%C6%8C%DE%CE%9C%DE%CE%A5%EF%EF%CE%DE%CE%9C%BD%ADkkJ)%D6%C6%8C%F7%F7%E7%F7%F7%E7%F7%F7%E7%F7%F7%E7%CE%BD%84%8Ck9%CE%BD%7B%CE%BD%84%CE%BD%84%CE%C6%8C%DE%CE%9C%EF%EF%CE%DE%CE%9C%C6%B5kkJ)%BD%ADk%EF%EF%CE%EF%EF%CE%EF%EF%CE%F7%F7%E7%DE%CE%A5%7BZ)%CE%BD%7B%CE%BD%7B%CE%BD%84%CE%BD%84%CE%C6%8C%E7%DE%C6%DE%CE%9C%C6%B5ksR9%A5%8CJ%DE%DE%AD%E7%DE%BD%EF%EF%CE%F7%F7%E7%E7%DE%C6%7BZ)%BD%ADk%CE%BD%7B%CE%BD%7B%CE%BD%84%CE%BD%84%E7%DE%BD%CE%C6%8C%C6%ADk%94%7BB%94%7BB%EF%EF%CE%F7%F7%E7%F7%F7%E7%F7%F7%E7%EF%EF%CE%8Ck9%A5%8CZ%CE%BD%7B%CE%BD%7B%CE%BD%7B%CE%BD%84%E7%DE%BD%CE%C6%8C%C6%ADk%A5%8CZ%7BZ)%E7%DE%BD%F7%F7%E7%EF%EF%CE%EF%EF%DE%EF%EF%DE%A5%8CZ%8CkB%CE%BD%7B%CE%BD%7B%CE%BD%7B%CE%BD%7B%E7%DE%BD%CE%BD%84%B8%A7d%BD%ADZkJ)%DE%DE%AD%F7%F7%E7%DE%DE%AD%EF%EF%CE%EF%EF%DE%BD%ADkkJ)%CE%BD%7B%CE%BD%7B%CE%BD%7B%CE%BD%7B%DE%D6%B5%CE%BD%7B%BD%ADZ%BD%ACikJ)%DE%CE%9C%F7%F7%E7%E7%DE%BD%EF%EF%CE%F7%F7%E7%CE%BD%7BZ1%18%BD%ADk%CE%BD%7B%CE%BD%7B%CE%BD%7B%DE%DE%AD%CE%BD%7B%BD%ADZ%BD%ADZ%7BZ)%C6%AD%7B%F7%F7%E7%E7%DE%BD%E7%DE%BD%F7%F7%E7%DE%CE%9CkJ)sR9%A5%8CZ%CE%BD%7B%CE%BD%7B%DE%DE%AD%CE%BD%7B%BD%ADZ%BD%ADZ%8Ck9%AD%9CZ%F7%F7%E7%EF%EF%CE%DE%CE%9C%F7%F7%E7%E7%DE%BD%BD%ADZ%9C%8CJZ1%18%A5%8CZ%CE%BD%7B%DE%DE%AD%C6%B5k%B5%A5J%BD%ADZ%94%7B9%9C%8CJ%F7%F7%E7%EF%EF%DE%CE%BD%84%F7%F7%E7%F7%EF%E7%EF%EF%CE%DE%CE%9C%9C%8CJkJ)%BD%ADk%DE%CE%A5%BD%ADk%AD%9CJ%B5%A5J%9C%8CJ%8Ck9%DE%CE%9C%DE%D6%9C%C6%B5Z%DE%CE%9C%F7%EF%DE%FF%FF%FF%EF%EF%DE%BD%ADZZ1!%BD%ADk%DE%CE%A5%BD%ADZ%AD%9CJ%AD%9CJ%AD%9CJsJ)kR)kR)kJ)%9C%8CJ%DE%CE%9C%F7%EF%DE%DE%DE%AD%94%7B9c9!%BD%ADk%DE%CE%A5%B5%9CR%AD%9CJ%AD%9CJ%AD%9CJ%AD%9CJ%B5%9CJ%B5%9CR%94%7BBc9%18%8Ck9%A5%8CJ%8Cs9Z1!%9C%8CR%CE%BD%84%DE%CE%9C%94%849%B5%9CR%BD%ADZ%BD%ADk%C6%B5k%CE%BD%7B%CE%BD%7B%CE%BD%7B%BD%ADskJ1R)%18kJ1%C6%AD%84%DE%CE%9C%DE%CE%9C%CE%BD%7B%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00
-
-
-
-
--
cgit v1.2.3-54-g00ecf
From 960da58d4a3e44e11ab23d73a136039981fe31fd Mon Sep 17 00:00:00 2001
From: André Fabian Silva Delgado
Date: Tue, 27 Nov 2012 13:08:38 -0200
Subject: iceweasel-17.0.1-2: replacing ddg lite to ddg html
---
libre/iceweasel-libre/#libre.patch# | 438 ++++++++++++++++++++++++++++++++++++
libre/iceweasel-libre/PKGBUILD | 4 +-
libre/iceweasel-libre/libre.patch | 24 +-
3 files changed, 452 insertions(+), 14 deletions(-)
create mode 100755 libre/iceweasel-libre/#libre.patch#
diff --git a/libre/iceweasel-libre/#libre.patch# b/libre/iceweasel-libre/#libre.patch#
new file mode 100755
index 000000000..54b84229e
--- /dev/null
+++ b/libre/iceweasel-libre/#libre.patch#
@@ -0,0 +1,438 @@
+diff -urN iceweasel-16.0.orig/browser/app/profile/firefox.js iceweasel-16.0/browser/app/profile/firefox.js
+--- iceweasel-16.0.orig/browser/app/profile/firefox.js 2012-10-05 20:01:58.000000000 -0300
++++ iceweasel-16.0/browser/app/profile/firefox.js 2012-10-11 17:19:44.984225170 -0200
+@@ -37,11 +37,11 @@
+ // Preferences for AMO integration
+ pref("extensions.getAddons.cache.enabled", true);
+ pref("extensions.getAddons.maxResults", 15);
+-pref("extensions.getAddons.get.url", "https://services.addons.mozilla.org/%LOCALE%/firefox/api/%API_VERSION%/search/guid:%IDS%?src=firefox&appOS=%OS%&appVersion=%VERSION%");
+-pref("extensions.getAddons.getWithPerformance.url", "https://services.addons.mozilla.org/%LOCALE%/firefox/api/%API_VERSION%/search/guid:%IDS%?src=firefox&appOS=%OS%&appVersion=%VERSION%&tMain=%TIME_MAIN%&tFirstPaint=%TIME_FIRST_PAINT%&tSessionRestored=%TIME_SESSION_RESTORED%");
+-pref("extensions.getAddons.search.browseURL", "https://addons.mozilla.org/%LOCALE%/firefox/search?q=%TERMS%&platform=%OS%&appver=%VERSION%");
+-pref("extensions.getAddons.search.url", "https://services.addons.mozilla.org/%LOCALE%/firefox/api/%API_VERSION%/search/%TERMS%/all/%MAX_RESULTS%/%OS%/%VERSION%/%COMPATIBILITY_MODE%?src=firefox");
+-pref("extensions.webservice.discoverURL", "https://services.addons.mozilla.org/%LOCALE%/firefox/discovery/pane/%VERSION%/%OS%/%COMPATIBILITY_MODE%");
++pref("extensions.getAddons.get.url", "http://www.gnu.org/s/gnuzilla/addons.html");
++pref("extensions.getAddons.getWithPerformance.url", "http://www.gnu.org/s/gnuzilla/addons.html");
++pref("extensions.getAddons.search.browseURL", "http://www.gnu.org/s/gnuzilla/addons.html");
++pref("extensions.getAddons.search.url", "http://www.gnu.org/s/gnuzilla/addons.html");
++pref("extensions.webservice.discoverURL", "http://www.gnu.org/s/gnuzilla/addons.html");
+
+ // Blocklist preferences
+ pref("extensions.blocklist.enabled", true);
+@@ -194,7 +194,7 @@
+ pref("extensions.update.interval", 86400); // Check for updates to Extensions and
+ // Themes every day
+ // Non-symmetric (not shared by extensions) extension-specific [update] preferences
+-pref("extensions.getMoreThemesURL", "https://addons.mozilla.org/%LOCALE%/firefox/getpersonas");
++pref("extensions.getMoreThemesURL", "http://www.gnu.org/software/gnuzilla/addons.html#themes");
+ pref("extensions.dss.enabled", false); // Dynamic Skin Switching
+ pref("extensions.dss.switchPending", false); // Non-dynamic switch pending after next
+ // restart.
+@@ -327,7 +327,7 @@
+ pref("browser.download.panel.removeFinishedDownloads", false);
+
+ // search engines URL
+-pref("browser.search.searchEnginesURL", "https://addons.mozilla.org/%LOCALE%/firefox/search-engines/");
++pref("browser.search.searchEnginesURL", "http://www.gnu.org/software/gnuzilla/addons.html#search%20engines");
+
+ // pointer to the default engine name
+ pref("browser.search.defaultenginename", "chrome://browser-region/locale/region.properties");
+@@ -584,7 +584,7 @@
+ pref("accessibility.typeaheadfind.flashBar", 1);
+
+ // plugin finder service url
+-pref("pfs.datasource.url", "https://pfs.mozilla.org/plugins/PluginFinderService.php?mimetype=%PLUGIN_MIMETYPE%&appID=%APP_ID%&appVersion=%APP_VERSION%&clientOS=%CLIENT_OS%&chromeLocale=%CHROME_LOCALE%&appRelease=%APP_RELEASE%");
++pref("pfs.datasource.url", "http://gnuzilla.gnu.org/plugins/PluginFinderService.php?mimetype=%PLUGIN_MIMETYPE%&appID=%APP_ID%&appVersion=%APP_VERSION%&clientOS=%CLIENT_OS%&chromeLocale=%CHROME_LOCALE%&appRelease=%APP_RELEASE%");
+
+ // by default we show an infobar message when pages require plugins the user has not installed, or are outdated
+ pref("plugins.hide_infobar_for_missing_plugin", false);
+diff -urN iceweasel-14.0.1.orig/browser/locales/en-US/chrome/browser-region/region.properties iceweasel-14.0.1/browser/locales/en-US/chrome/browser-region/region.properties
+--- mozilla-release.orig/browser/locales/en-US/chrome/browser-region/region.properties 2012-06-01 09:03:48.000000000 -0300
++++ mozilla-release/browser/locales/en-US/chrome/browser-region/region.properties 2012-06-15 02:17:00.978636665 -0300
+@@ -1,23 +1,23 @@
+ # Default search engine
+-browser.search.defaultenginename=Google
++browser.search.defaultenginename=Duck Duck Go (HTML)
+
+ # Search engine order (order displayed in the search bar dropdown)s
+-browser.search.order.1=Google
+-browser.search.order.2=Yahoo
+-browser.search.order.3=Bing
++browser.search.order.1=Duck Duck Go (HTML)
++browser.search.order.2=Seeks Search
++browser.search.order.3=YaCy
+
+ # This is the default set of web based feed handlers shown in the reader
+ # selection UI
+-browser.contentHandlers.types.0.title=Google
+-browser.contentHandlers.types.0.uri=http://fusion.google.com/add?feedurl=%s
+-browser.contentHandlers.types.1.title=My Yahoo!
+-browser.contentHandlers.types.1.uri=http://add.my.yahoo.com/rss?url=%s
++browser.contentHandlers.types.0.title=
++browser.contentHandlers.types.0.uri=about:blank
++browser.contentHandlers.types.1.title=
++browser.contentHandlers.types.1.uri=about:blank
+
+ # URL for site-specific search engines
+ # TRANSLATION NOTE: {moz:domain} and {searchTerms} are placeholders for the site
+ # to be searched and the user's search query. Place them in the appropriate location
+ # for your locale's URL but do not translate them.
+-browser.search.siteSearchURL=https://www.google.com/search?ie=UTF-8&oe=UTF-8&sourceid=navclient&q=site%3A{moz:domain}+{searchTerms}
++browser.search.siteSearchURL=https://duckduckgo.com/html/?q=site%3A{moz:domain}+{searchTerms}
+
+ # increment this number when anything gets changed in the list below. This will
+ # cause Firefox to re-read these prefs and inject any new handlers into the
+@@ -27,19 +27,19 @@
+ gecko.handlerService.defaultHandlersVersion=3
+
+ # The default set of protocol handlers for webcal:
+-gecko.handlerService.schemes.webcal.0.name=30 Boxes
+-gecko.handlerService.schemes.webcal.0.uriTemplate=http://30boxes.com/external/widget?refer=ff&url=%s
++gecko.handlerService.schemes.webcal.0.name=
++gecko.handlerService.schemes.webcal.0.uriTemplate=about:blank
+
+ # The default set of protocol handlers for mailto:
+-gecko.handlerService.schemes.mailto.0.name=Yahoo! Mail
+-gecko.handlerService.schemes.mailto.0.uriTemplate=http://compose.mail.yahoo.com/?To=%s
+-gecko.handlerService.schemes.mailto.1.name=Gmail
+-gecko.handlerService.schemes.mailto.1.uriTemplate=https://mail.google.com/mail/?extsrc=mailto&url=%s
++gecko.handlerService.schemes.mailto.0.name=
++gecko.handlerService.schemes.mailto.0.uriTemplate=about:blank
++gecko.handlerService.schemes.mailto.1.name=
++gecko.handlerService.schemes.mailto.1.uriTemplate=about:blank
+
+ # The default set of protocol handlers for irc:
+-gecko.handlerService.schemes.irc.0.name=Mibbit
+-gecko.handlerService.schemes.irc.0.uriTemplate=https://www.mibbit.com/?url=%s
++gecko.handlerService.schemes.irc.0.name=Freenode
++gecko.handlerService.schemes.irc.0.uriTemplate=https://webchat.freenode.net/
+
+ # The default set of protocol handlers for ircs:
+-gecko.handlerService.schemes.ircs.0.name=Mibbit
+-gecko.handlerService.schemes.ircs.0.uriTemplate=https://www.mibbit.com/?url=%s
++gecko.handlerService.schemes.ircs.0.name=Freenode
++gecko.handlerService.schemes.ircs.0.uriTemplate=https://webchat.freenode.net/
+diff -urN iceweasel-13.0.orig/build/pgo/blueprint/elements.html iceweasel-13.0/build/pgo/blueprint/elements.html
+--- mozilla-build.orig/build/pgo/blueprint/elements.html 2012-06-01 09:03:49.000000000 -0300
++++ mozilla-build/build/pgo/blueprint/elements.html 2012-06-05 20:37:22.059133787 -0300
+@@ -143,7 +143,7 @@
+
+
+ <a> anchor
+- <a> a + href
++ <a> a + href
+
+
+ <abbr> abbr - extended text when mouseover.
+diff -urN iceweasel-13.0.orig/dom/ipc/test.xul iceweasel-13.0/dom/ipc/test.xul
+--- mozilla-build.orig/dom/ipc/test.xul 2012-06-01 09:03:55.000000000 -0300
++++ mozilla-build/dom/ipc/test.xul 2012-06-05 20:40:59.453890004 -0300
+@@ -294,6 +294,6 @@
+ oncommand="document.getElementById('page').QueryInterface(Components.interfaces.nsIFrameLoaderOwner).frameLoader.delayRemoteDialogs = this.checked;"/>
+
+
+-
++
+
+
+diff -Naur iceweasel-14.0.1.orig/mobile/android/app/mobile.js iceweasel-14.0.1.orig/mobile/android/app/mobile.js
+--- mozilla-build.orig/mobile/android/app/mobile.js 2012-07-12 14:27:37.000000000 -0300
++++ mozilla-build/mobile/android/app/mobile.js 2012-07-17 22:14:47.293560718 -0300
+@@ -226,13 +226,13 @@
+ /* preferences for the Get Add-ons pane */
+ pref("extensions.getAddons.cache.enabled", true);
+ pref("extensions.getAddons.maxResults", 15);
+-pref("extensions.getAddons.recommended.browseURL", "https://addons.mozilla.org/%LOCALE%/android/recommended/");
+-pref("extensions.getAddons.recommended.url", "https://services.addons.mozilla.org/%LOCALE%/android/api/%API_VERSION%/list/featured/all/%MAX_RESULTS%/%OS%/%VERSION%");
+-pref("extensions.getAddons.search.browseURL", "https://addons.mozilla.org/%LOCALE%/android/search?q=%TERMS%&platform=%OS%&appver=%VERSION%");
+-pref("extensions.getAddons.search.url", "https://services.addons.mozilla.org/%LOCALE%/android/api/%API_VERSION%/search/%TERMS%/all/%MAX_RESULTS%/%OS%/%VERSION%/%COMPATIBILITY_MODE%");
+-pref("extensions.getAddons.browseAddons", "https://addons.mozilla.org/%LOCALE%/android/");
+-pref("extensions.getAddons.get.url", "https://services.addons.mozilla.org/%LOCALE%/android/api/%API_VERSION%/search/guid:%IDS%?src=mobile&appOS=%OS%&appVersion=%VERSION%");
+-pref("extensions.getAddons.getWithPerformance.url", "https://services.addons.mozilla.org/%LOCALE%/android/api/%API_VERSION%/search/guid:%IDS%?src=mobile&appOS=%OS%&appVersion=%VERSION%&tMain=%TIME_MAIN%&tFirstPaint=%TIME_FIRST_PAINT%&tSessionRestored=%TIME_SESSION_RESTORED%");
++pref("extensions.getAddons.recommended.browseURL", "http://www.gnu.org/s/gnuzilla/addons.html");
++pref("extensions.getAddons.recommended.url", "http://www.gnu.org/s/gnuzilla/addons.html");
++pref("extensions.getAddons.search.browseURL", "http://www.gnu.org/s/gnuzilla/addons.html");
++pref("extensions.getAddons.search.url", "http://www.gnu.org/s/gnuzilla/addons.html");
++pref("extensions.getAddons.browseAddons", "http://www.gnu.org/s/gnuzilla/addons.html");
++pref("extensions.getAddons.get.url", "http://www.gnu.org/s/gnuzilla/addons.html");
++pref("extensions.getAddons.getWithPerformance.url", "http://www.gnu.org/s/gnuzilla/addons.html");
+
+ /* preference for the locale picker */
+ pref("extensions.getLocales.get.url", "");
+@@ -259,7 +259,7 @@
+ pref("dom.disable_window_find", true);
+
+ pref("keyword.enabled", true);
+-pref("keyword.URL", "");
++pref("keyword.URL", "https://duckduckgo.com/lite/?q=");
+
+ pref("accessibility.typeaheadfind", false);
+ pref("accessibility.typeaheadfind.timeout", 5000);
+diff -urN iceweasel-13.0.orig/layout/ipc/test-ipcbrowser.xul iceweasel-13.0/layout/ipc/test-ipcbrowser.xul
+--- mozilla-build.orig/layout/ipc/test-ipcbrowser.xul 2012-06-01 09:04:06.000000000 -0300
++++ mozilla-build/layout/ipc/test-ipcbrowser.xul 2012-06-05 20:44:00.714006926 -0300
+@@ -69,6 +69,6 @@
+ label="setViewportScale"/>
+
+
+-
+
+diff -urN iceweasel-14.0.1.orig/mobile/xul/app/mobile.js iceweasel-14.0.1/mobile/xul/app/mobile.js
+--- mozilla-build.orig/mobile/xul/app/mobile.js 2012-06-01 09:04:14.000000000 -0300
++++ mozilla-build/mobile/xul/app/mobile.js 2012-06-05 20:48:20.193241600 -0300
+@@ -221,13 +221,12 @@
+ /* preferences for the Get Add-ons pane */
+ pref("extensions.getAddons.cache.enabled", true);
+ pref("extensions.getAddons.maxResults", 15);
+-pref("extensions.getAddons.recommended.browseURL", "https://addons.mozilla.org/%LOCALE%/mobile/recommended/");
+-pref("extensions.getAddons.recommended.url", "https://services.addons.mozilla.org/%LOCALE%/mobile/api/%API_VERSION%/list/featured/all/%MAX_RESULTS%/%OS%/%VERSION%");
+-pref("extensions.getAddons.search.browseURL", "https://addons.mozilla.org/%LOCALE%/mobile/search?q=%TERMS%&platform=%OS%&appver=%VERSION%");
+-pref("extensions.getAddons.search.url", "https://services.addons.mozilla.org/%LOCALE%/mobile/api/%API_VERSION%/search/%TERMS%/all/%MAX_RESULTS%/%OS%/%VERSION%/%COMPATIBILITY_MODE%");
+-pref("extensions.getAddons.browseAddons", "https://addons.mozilla.org/%LOCALE%/mobile/");
+-pref("extensions.getAddons.get.url", "https://services.addons.mozilla.org/%LOCALE%/mobile/api/%API_VERSION%/search/guid:%IDS%?src=mobile&appOS=%OS%&appVersion=%VERSION%");
+-pref("extensions.getAddons.getWithPerformance.url", "https://services.addons.mozilla.org/%LOCALE%/mobile/api/%API_VERSION%/search/guid:%IDS%?src=mobile&appOS=%OS%&appVersion=%VERSION%&tMain=%TIME_MAIN%&tFirstPaint=%TIME_FIRST_PAINT%&tSessionRestored=%TIME_SESSION_RESTORED%");
++pref("extensions.getAddons.recommended.browseURL", "http://www.gnu.org/s/gnuzilla/addons.html");
++pref("extensions.getAddons.recommended.url", "http://www.gnu.org/s/gnuzilla/addons.html");
++pref("extensions.getAddons.search.browseURL", "http://www.gnu.org/s/gnuzilla/addons.html");
++pref("extensions.getAddons.search.url", "http://www.gnu.org/s/gnuzilla/addons.html");
++pref("extensions.getAddons.browseAddons", "http://www.gnu.org/s/gnuzilla/addons.html");
++pref("extensions.getAddons.get.url", "http://www.gnu.org/s/gnuzilla/addons.html");
+
+ /* preference for the locale picker */
+ pref("extensions.getLocales.get.url", "");
+@@ -247,7 +246,7 @@
+ pref("dom.disable_window_open_dialog_feature", true);
+
+ pref("keyword.enabled", true);
+-pref("keyword.URL", "https://www.google.com/m?ie=UTF-8&oe=UTF-8&sourceid=navclient&q=");
++pref("keyword.URL", "https://duckduckgo.com/lite/?q=");
+
+ pref("accessibility.typeaheadfind", false);
+ pref("accessibility.typeaheadfind.timeout", 5000);
+diff -urN iceweasel-13.0.orig/mobile/locales/en-US/chrome/region.properties iceweasel-13.0/mobile/locales/en-US/chrome/region.properties
+--- mozilla-release.orig/mobile/locales/en-US/chrome/region.properties 2012-06-01 09:04:14.000000000 -0300
++++ mozilla-release/mobile/locales/en-US/chrome/region.properties 2012-06-15 02:17:43.446130868 -0300
+@@ -1,18 +1,18 @@
+ # Default search engine
+-browser.search.defaultenginename=Google
++browser.search.defaultenginename=Duck Duck Go (Lite)
+
+ # Search engine order (order displayed in the search bar dropdown)s
+-browser.search.order.1=Google
++browser.search.order.1=Duck Duck Go (Lite)
+
+ # This is the default set of web based feed handlers shown in the reader
+ # selection UI
+-browser.contentHandlers.types.0.title=My Yahoo
+-browser.contentHandlers.types.0.uri=http://add.my.yahoo.com/rss?url=%s
+-browser.contentHandlers.types.1.title=Google
+-browser.contentHandlers.types.1.uri=http://fusion.google.com/add?feedurl=%s
++browser.contentHandlers.types.0.title=
++browser.contentHandlers.types.0.uri=about:blank
++browser.contentHandlers.types.1.title=
++browser.contentHandlers.types.1.uri=about:blank
+
+ # Keyword URL (for location bar searches)
+-keyword.URL=https://www.google.com/search?ie=UTF-8&oe=UTF-8&sourceid=navclient&gfns=1&q=
++keyword.URL=https://duckduckgo.com/lite/?q=site%3A{moz:domain}+{searchTerms}
+
+ # increment this number when anything gets changed in the list below. This will
+ # cause Firefox to re-read these prefs and inject any new handlers into the
+@@ -22,11 +22,11 @@
+ gecko.handlerService.defaultHandlersVersion=2
+
+ # The default set of protocol handlers for webcal:
+-gecko.handlerService.schemes.webcal.0.name=30 Boxes
+-gecko.handlerService.schemes.webcal.0.uriTemplate=http://30boxes.com/external/widget?refer=ff&url=%s
++gecko.handlerService.schemes.webcal.0.name=
++gecko.handlerService.schemes.webcal.0.uriTemplate=about:blank
+
+ # The default set of protocol handlers for mailto:
+-gecko.handlerService.schemes.mailto.0.name=Yahoo! Mail
+-gecko.handlerService.schemes.mailto.0.uriTemplate=http://compose.mail.yahoo.com/?To=%s
+-gecko.handlerService.schemes.mailto.1.name=Gmail
+-gecko.handlerService.schemes.mailto.1.uriTemplate=https://mail.google.com/mail/?extsrc=mailto&url=%s
++gecko.handlerService.schemes.mailto.0.name=
++gecko.handlerService.schemes.mailto.0.uriTemplate=about:blank
++gecko.handlerService.schemes.mailto.1.name=
++gecko.handlerService.schemes.mailto.1.uriTemplate=about:blank
+diff -urN iceweasel-14.0.orig/modules/libpref/src/init/all.js iceweasel-14.0/modules/libpref/src/init/all.js
+--- mozilla-build.orig/modules/libpref/src/init/all.js 2012-06-01 09:04:16.000000000 -0300
++++ mozilla-build/modules/libpref/src/init/all.js 2012-06-05 20:55:41.569045759 -0300
+@@ -47,7 +47,7 @@
+ // SYNTAX HINTS: dashes are delimiters. Use underscores instead.
+ // The first character after a period must be alphabetic.
+
+-pref("keyword.URL", "https://www.google.com/search?ie=UTF-8&oe=utf-8&q=");
++pref("keyword.URL", "https://duckduckgo.com/lite/?q=");
+ pref("keyword.enabled", false);
+ pref("general.useragent.locale", "chrome://global/locale/intl.properties");
+ pref("general.useragent.compatMode.firefox", false);
+diff -urN iceweasel-13.0.orig/toolkit/locales/en-US/chrome/global-region/region.properties iceweasel-13.0/toolkit/locales/en-US/chrome/global-region/region.properties
+--- mozilla-build.orig/toolkit/locales/en-US/chrome/global-region/region.properties 2012-06-01 09:04:20.000000000 -0300
++++ mozilla-build/toolkit/locales/en-US/chrome/global-region/region.properties 2012-06-05 20:58:59.068158482 -0300
+@@ -4,10 +4,10 @@
+ pluginStartupMessage=Starting Plugin for type
+
+ # plug-ins URLs
+-more_plugins_label=mozilla.org
+-more_plugins_url=https://pfs.mozilla.org/plugins/
+-pluginupdates_label=mozilla.com/plugincheck
+-pluginupdates_url=http://www.mozilla.com/plugincheck/
+-plugindoc_label=plugindoc.mozdev.org
+-plugindoc_url=http://plugindoc.mozdev.org/
++more_plugins_label=
++more_plugins_url=about:blank
++pluginupdates_label=
++pluginupdates_url=about:blank
++plugindoc_label=
++plugindoc_url=about:blank
+
+diff -urN iceweasel-14.0.1.orig/browser/locales/generic/profile/bookmarks.html.in iceweasel-14.0.1/browser/locales/generic/profile/bookmarks.html.in
+--- mozilla-release.orig/browser/locales/generic/profile/bookmarks.html.in 2012-06-01 09:03:48.000000000 -0300
++++ mozilla-release/browser/locales/generic/profile/bookmarks.html.in 2012-06-15 22:54:08.446274144 -0300
+@@ -11,13 +11,20 @@
+
@bookmarks_toolbarfolder@
+ @bookmarks_toolbarfolder_description@
+
+-
@getting_started@
++ Parabola GNU/Linux-libre
+
+-
@firefox_heading@
++ Parabola GNU/Linux-libre
+
+-
@firefox_help@
+- @firefox_customize@
+- @firefox_community@
+- @firefox_about@
++ Parabola GNU/Linux-libre
++ Parabola GNU/Linux-libre Packages
++ Parabola GNU/Linux-libre Wiki
++ Parabola GNU/Linux-libre Labs
++
++
Free Software Foundation
++
++
Free Software Foundation
++ LibrePlanet
++ Free addons
++ h-node
+
+
+diff -urN iceweasel-13.0.orig/browser/base/content/abouthome/aboutHome.js iceweasel-13.0/browser/base/content/abouthome/aboutHome.js
+--- mozilla-release.orig/browser/base/content/abouthome/aboutHome.js 2012-06-01 09:03:47.000000000 -0300
++++ mozilla-release/browser/base/content/abouthome/aboutHome.js 2012-06-13 18:07:51.217531774 -0300
+@@ -38,104 +38,6 @@
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+-// If a definition requires additional params, check that the final search url
+-// is handled correctly by the engine.
+-const SEARCH_ENGINES = {
+- "Google": {
+- image: "data:image/png;base64," +
+- "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"
+- , params: "source=hp&channel=np"
+- }
+-
+-, "Яндекс":
+- {
+- image: "data:image/png;base64," +
+- "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"
+- }
+-};
+-
+ // The process of adding a new default snippet involves:
+ // * add a new entity to aboutHome.dtd
+ // * add a for it in aboutHome.xhtml
+@@ -143,7 +45,7 @@
+ // The part of the snippet will be linked to the corresponding url.
+ const DEFAULT_SNIPPETS_URLS = [
+ "http://www.mozilla.com/firefox/features/?WT.mc_ID=default1"
+-, "https://addons.mozilla.org/firefox/?src=snippet&WT.mc_ID=default2"
++, "http://www.gnu.org/software/gnuzilla/addons.html?src=snippet&WT.mc_ID=default2"
+ ];
+
+ const SNIPPETS_UPDATE_INTERVAL_MS = 86400000; // 1 Day.
diff --git a/libre/iceweasel-libre/PKGBUILD b/libre/iceweasel-libre/PKGBUILD
index 185f1c039..ab35bf55f 100755
--- a/libre/iceweasel-libre/PKGBUILD
+++ b/libre/iceweasel-libre/PKGBUILD
@@ -22,7 +22,7 @@ debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; }
_pkgname=iceweasel
pkgname=iceweasel-libre
pkgver=${_debver}.${_debrel}
-pkgrel=1
+pkgrel=2
if [ -z "$pkgname" ]; then pkgname=$_pkgname; fi
if $_pgo; then
@@ -57,7 +57,7 @@ md5sums=('3e555026478026987753b4859ec91d3b'
'eab149c1994ab14392e55af3abb08e80'
'ac29b01c189f20abae2f3eef1618ffc0'
'a485a2b5dc544a8a2bd40c985d2e5813'
- '8768dfc39e9f1057c2956bf4405ae58e'
+ 'a54ac42a670b72deb38f17b571740a6e'
'abf5ecb74caa857abb42bcfbb3442d9c'
'0d053487907de4376d67d8f499c5502b'
'52e52f840a49eb1d14be1c0065b03a93'
diff --git a/libre/iceweasel-libre/libre.patch b/libre/iceweasel-libre/libre.patch
index 7e7b7290f..183bcd4c6 100755
--- a/libre/iceweasel-libre/libre.patch
+++ b/libre/iceweasel-libre/libre.patch
@@ -51,13 +51,13 @@ diff -urN iceweasel-14.0.1.orig/browser/locales/en-US/chrome/browser-region/regi
@@ -1,23 +1,23 @@
# Default search engine
-browser.search.defaultenginename=Google
-+browser.search.defaultenginename=Duck Duck Go (Lite)
++browser.search.defaultenginename=Duck Duck Go (HTML)
# Search engine order (order displayed in the search bar dropdown)s
-browser.search.order.1=Google
-browser.search.order.2=Yahoo
-browser.search.order.3=Bing
-+browser.search.order.1=Duck Duck Go (Lite)
++browser.search.order.1=Duck Duck Go (HTML)
+browser.search.order.2=Seeks Search
+browser.search.order.3=YaCy
@@ -77,7 +77,7 @@ diff -urN iceweasel-14.0.1.orig/browser/locales/en-US/chrome/browser-region/regi
# to be searched and the user's search query. Place them in the appropriate location
# for your locale's URL but do not translate them.
-browser.search.siteSearchURL=https://www.google.com/search?ie=UTF-8&oe=UTF-8&sourceid=navclient&q=site%3A{moz:domain}+{searchTerms}
-+browser.search.siteSearchURL=https://duckduckgo.com/lite/?q=site%3A{moz:domain}+{searchTerms}
++browser.search.siteSearchURL=https://duckduckgo.com/html/?q=site%3A{moz:domain}+{searchTerms}
# increment this number when anything gets changed in the list below. This will
# cause Firefox to re-read these prefs and inject any new handlers into the
@@ -119,7 +119,7 @@ diff -urN iceweasel-13.0.orig/build/pgo/blueprint/elements.html iceweasel-13.0/b
<a> anchor
- <a> a + href
-+ <a> a + href
++ <a> a + href
<abbr> abbr - extended text when mouseover.
@@ -131,7 +131,7 @@ diff -urN iceweasel-13.0.orig/dom/ipc/test.xul iceweasel-13.0/dom/ipc/test.xul
-
-+
++
diff -Naur iceweasel-14.0.1.orig/mobile/android/app/mobile.js iceweasel-14.0.1.orig/mobile/android/app/mobile.js
@@ -163,7 +163,7 @@ diff -Naur iceweasel-14.0.1.orig/mobile/android/app/mobile.js iceweasel-14.0.1.o
pref("keyword.enabled", true);
-pref("keyword.URL", "");
-+pref("keyword.URL", "https://duckduckgo.com/lite/?q=");
++pref("keyword.URL", "https://duckduckgo.com/html/?q=");
pref("accessibility.typeaheadfind", false);
pref("accessibility.typeaheadfind.timeout", 5000);
@@ -175,7 +175,7 @@ diff -urN iceweasel-13.0.orig/layout/ipc/test-ipcbrowser.xul iceweasel-13.0/layo
-
diff -urN iceweasel-14.0.1.orig/mobile/xul/app/mobile.js iceweasel-14.0.1/mobile/xul/app/mobile.js
@@ -206,7 +206,7 @@ diff -urN iceweasel-14.0.1.orig/mobile/xul/app/mobile.js iceweasel-14.0.1/mobile
pref("keyword.enabled", true);
-pref("keyword.URL", "https://www.google.com/m?ie=UTF-8&oe=UTF-8&sourceid=navclient&q=");
-+pref("keyword.URL", "https://duckduckgo.com/lite/?q=");
++pref("keyword.URL", "https://duckduckgo.com/html/?q=");
pref("accessibility.typeaheadfind", false);
pref("accessibility.typeaheadfind.timeout", 5000);
@@ -216,11 +216,11 @@ diff -urN iceweasel-13.0.orig/mobile/locales/en-US/chrome/region.properties icew
@@ -1,18 +1,18 @@
# Default search engine
-browser.search.defaultenginename=Google
-+browser.search.defaultenginename=Duck Duck Go (Lite)
++browser.search.defaultenginename=Duck Duck Go (HTML)
# Search engine order (order displayed in the search bar dropdown)s
-browser.search.order.1=Google
-+browser.search.order.1=Duck Duck Go (Lite)
++browser.search.order.1=Duck Duck Go (HTML)
# This is the default set of web based feed handlers shown in the reader
# selection UI
@@ -235,7 +235,7 @@ diff -urN iceweasel-13.0.orig/mobile/locales/en-US/chrome/region.properties icew
# Keyword URL (for location bar searches)
-keyword.URL=https://www.google.com/search?ie=UTF-8&oe=UTF-8&sourceid=navclient&gfns=1&q=
-+keyword.URL=https://duckduckgo.com/lite/?q=site%3A{moz:domain}+{searchTerms}
++keyword.URL=https://duckduckgo.com/html/?q=site%3A{moz:domain}+{searchTerms}
# increment this number when anything gets changed in the list below. This will
# cause Firefox to re-read these prefs and inject any new handlers into the
@@ -265,7 +265,7 @@ diff -urN iceweasel-14.0.orig/modules/libpref/src/init/all.js iceweasel-14.0/mod
// The first character after a period must be alphabetic.
-pref("keyword.URL", "https://www.google.com/search?ie=UTF-8&oe=utf-8&q=");
-+pref("keyword.URL", "https://duckduckgo.com/lite/?q=");
++pref("keyword.URL", "https://duckduckgo.com/html/?q=");
pref("keyword.enabled", false);
pref("general.useragent.locale", "chrome://global/locale/intl.properties");
pref("general.useragent.compatMode.firefox", false);
--
cgit v1.2.3-54-g00ecf
From 3ca21aa48b6d638985d41b8c3d298993d0c7c4f4 Mon Sep 17 00:00:00 2001
From: André Fabian Silva Delgado
Date: Tue, 27 Nov 2012 13:09:29 -0200
Subject: iceape-libre-2.7.11.1-2: replacing ddg lite to ddg html
---
libre/iceape-libre/PKGBUILD | 4 ++--
libre/iceape-libre/libre.patch | 16 ++++++++--------
2 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/libre/iceape-libre/PKGBUILD b/libre/iceape-libre/PKGBUILD
index 2247f0a8a..2325b8cd7 100755
--- a/libre/iceape-libre/PKGBUILD
+++ b/libre/iceape-libre/PKGBUILD
@@ -11,7 +11,7 @@ debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; }
_pkgname=${_debname}
pkgname=${_debname}-libre
pkgver=${_debver}.${_debrel}
-pkgrel=1
+pkgrel=2
pkgdesc="A libre version of Debian Iceape, the Internet Suite based on Mozilla Seamonkey."
arch=('i586' 'i686' 'x86_64' 'mips64el')
license=('GPL2' 'MPL' 'LGPL')
@@ -35,7 +35,7 @@ md5sums=('40473b4c662975eda865e1fc35c4953b'
'7266333e31731af8bb50c2eca8d0bd26'
'25b6fe16ac24cd5c852213e5c1adb272'
'c395d443a8c4c16880c7322bcf174743'
- '433b5cd7f02f0ed8861237e877f51ebf')
+ 'ed7a06c9e73a9f3e023d7bff9878504b')
build() {
export QUILT_PATCHES=debian/patches
diff --git a/libre/iceape-libre/libre.patch b/libre/iceape-libre/libre.patch
index d25f8dbf5..9947b1bbe 100755
--- a/libre/iceape-libre/libre.patch
+++ b/libre/iceape-libre/libre.patch
@@ -3,13 +3,13 @@
@@ -1,23 +1,23 @@
# Default search engine
-browser.search.defaultenginename=Google
-+browser.search.defaultenginename=Duck Duck Go (Lite)
++browser.search.defaultenginename=Duck Duck Go (HTML)
# Search engine order (order displayed in the search bar dropdown)s
-browser.search.order.1=Google
-browser.search.order.2=Yahoo
-browser.search.order.3=Bing
-+browser.search.order.1=Duck Duck Go (Lite)
++browser.search.order.1=Duck Duck Go (HTML)
+browser.search.order.2=Seeks Search
+browser.search.order.3=YaCy
@@ -29,7 +29,7 @@
# to be searched and the user's search query. Place them in the appropriate location
# for your locale's URL but do not translate them.
-browser.search.siteSearchURL=http://www.google.com/search?ie=UTF-8&oe=UTF-8&sourceid=navclient&q=site%3A{moz:domain}+{searchTerms}
-+browser.search.siteSearchURL=https://duckduckgo.com/lite/?q=site%3A{moz:domain}+{searchTerms}
++browser.search.siteSearchURL=https://duckduckgo.com/html/?q=site%3A{moz:domain}+{searchTerms}
# increment this number when anything gets changed in the list below. This will
# cause Firefox to re-read these prefs and inject any new handlers into the
@@ -70,7 +70,7 @@
// The first character after a period must be alphabetic.
-pref("keyword.URL", "http://www.google.com/search?ie=UTF-8&oe=utf-8&q=");
-+pref("keyword.URL", "https://duckduckgo.com/lite/?q=");
++pref("keyword.URL", "https://duckduckgo.com/html/?q=");
pref("keyword.enabled", false);
pref("general.useragent.locale", "chrome://global/locale/intl.properties");
pref("general.useragent.compatMode.firefox", false);
@@ -125,7 +125,7 @@
browser.startup.homepage=about:
browser.throbber.url=about:
-browser.search.defaulturl=http://www.google.com/search?q=
-+browser.search.defaulturl=https://duckduckgo.com/lite/?q=
++browser.search.defaulturl=https://duckduckgo.com/html/?q=
-browser.translation.service=http://translate.google.com/translate?prev=/language_tools&u=
-browser.translation.serviceDomain=translate.google.com
@@ -151,12 +151,12 @@
@@ -1,10 +1,10 @@
# Default search engine
-browser.search.defaultenginename=Google
-+browser.search.defaultenginename=Duck Duck Go (Lite)
++browser.search.defaultenginename=Duck Duck Go (HTML)
# Search engine order (order displayed in the search bar dropdown)
-browser.search.order.1=Google
-browser.search.order.2=Yahoo
-+browser.search.order.1=Duck Duck Go (Lite)
++browser.search.order.1=Duck Duck Go (HTML)
+browser.search.order.2=Seeks Search
# More information about this update link available in the update wizard.
@@ -187,7 +187,7 @@
- Google
- Google Groups
- Google News
-+ Duck Duck Go (Lite)
++ Duck Duck Go (HTML)
#unfilter emptyLines
--
cgit v1.2.3-54-g00ecf
From b50bf5eaf7f83e21df1d415103abd7f17c5439cb Mon Sep 17 00:00:00 2001
From: André Fabian Silva Delgado
Date: Tue, 27 Nov 2012 13:10:05 -0200
Subject: icecat-14.0-3: replacing ddg lite to ddg html
---
libre/icecat/PKGBUILD | 4 ++--
libre/icecat/libre.patch | 24 ++++++++++++------------
2 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/libre/icecat/PKGBUILD b/libre/icecat/PKGBUILD
index fd050fb27..cb4ef9688 100755
--- a/libre/icecat/PKGBUILD
+++ b/libre/icecat/PKGBUILD
@@ -16,7 +16,7 @@
_pgo=false
pkgname=icecat
pkgver=14.0
-pkgrel=2
+pkgrel=3
pkgdesc='The GNUzilla web browser, based on Mozilla Firefox. SafeBrowsing and other Google services disabled!'
arch=(i686 x86_64 mips64el)
license=(GPL2 MPL LGPL)
@@ -79,7 +79,7 @@ md5sums=(
3117865902d1a20ab61d75707be9888e
ac29b01c189f20abae2f3eef1618ffc0
3009b176cc5f9b1e416b1bf7c45b064b
- 72e6bb9ebebe555b4ab961add3df3b27
+ 0fe48b455f9b0ad7993071cd766b3bbf
e81ad01dbc16ba28bf92ba4b7c309ca7
d93fe402b87cd000a869e1fd6badc6c9
b320085e7effa2890a79f4f45760614b
diff --git a/libre/icecat/libre.patch b/libre/icecat/libre.patch
index 18dfcc177..b5a9acc0b 100755
--- a/libre/icecat/libre.patch
+++ b/libre/icecat/libre.patch
@@ -142,13 +142,13 @@ diff -Nur a/browser/locales/en-US/chrome/browser-region/region.properties b/brow
@@ -1,28 +1,28 @@
# Default search engine
-browser.search.defaultenginename=Google
-+browser.search.defaultenginename=Duck Duck Go (Lite)
++browser.search.defaultenginename=Duck Duck Go (HTML)
# Search engine order (order displayed in the search bar dropdown)s
-browser.search.order.1=Duck Duck Go
-browser.search.order.2=Google
-browser.search.order.3=Yahoo
-+browser.search.order.1=Duck Duck Go (Lite)
++browser.search.order.1=Duck Duck Go (HTML)
+browser.search.order.2=Seeks Search
+browser.search.order.3=YaCy
@@ -169,14 +169,14 @@ diff -Nur a/browser/locales/en-US/chrome/browser-region/region.properties b/brow
# Keyword URL (for location bar searches)
-keyword.URL=http://www.google.com/search?ie=UTF-8&oe=UTF-8&sourceid=navclient&gfns=1&q=
-+keyword.URL=https://duckduckgo.com/lite/?q=
++keyword.URL=https://duckduckgo.com/html/?q=
# URL for site-specific search engines
# TRANSLATION NOTE: {moz:domain} and {searchTerms} are placeholders for the site
# to be searched and the user's search query. Place them in the appropriate location
# for your locale's URL but do not translate them.
-browser.search.siteSearchURL=https://www.google.com/search?ie=UTF-8&oe=UTF-8&sourceid=navclient&q=site%3A{moz:domain}+{searchTerms}
-+browser.search.siteSearchURL=https://duckduckgo.com/lite/?q=site%3A{moz:domain}+{searchTerms}
++browser.search.siteSearchURL=https://duckduckgo.com/html/?q=site%3A{moz:domain}+{searchTerms}
# increment this number when anything gets changed in the list below. This will
# cause Firefox to re-read these prefs and inject any new handlers into the
@@ -240,7 +240,7 @@ diff -Nur a/build/pgo/blueprint/elements.html b/build/pgo/blueprint/elements.htm
<a> anchor
- <a> a + href
-+ <a> a + href
++ <a> a + href
<abbr> abbr - extended text when mouseover.
@@ -252,7 +252,7 @@ diff -Nur a/dom/ipc/test.xul b/dom/ipc/test.xul
-
-+
++
diff -Nur a/layout/ipc/test-ipcbrowser.xul b/layout/ipc/test-ipcbrowser.xul
@@ -263,7 +263,7 @@ diff -Nur a/layout/ipc/test-ipcbrowser.xul b/layout/ipc/test-ipcbrowser.xul
-
diff -Nur a/mobile/android/app/mobile.js b/mobile/android/app/mobile.js
@@ -296,11 +296,11 @@ diff -Nur a/mobile/locales/en-US/chrome/region.properties b/mobile/locales/en-US
@@ -1,18 +1,18 @@
# Default search engine
-browser.search.defaultenginename=Google
-+browser.search.defaultenginename=Duck Duck Go (Lite)
++browser.search.defaultenginename=Duck Duck Go (HTML)
# Search engine order (order displayed in the search bar dropdown)s
-browser.search.order.1=Google
-+browser.search.order.1=Duck Duck Go (Lite)
++browser.search.order.1=Duck Duck Go (HTML)
# This is the default set of web based feed handlers shown in the reader
# selection UI
@@ -315,7 +315,7 @@ diff -Nur a/mobile/locales/en-US/chrome/region.properties b/mobile/locales/en-US
# Keyword URL (for location bar searches)
-keyword.URL=https://www.google.com/search?ie=UTF-8&oe=UTF-8&sourceid=navclient&gfns=1&q=
-+keyword.URL=https://duckduckgo.com/lite/?q=
++keyword.URL=https://duckduckgo.com/html/?q=
# increment this number when anything gets changed in the list below. This will
# cause Firefox to re-read these prefs and inject any new handlers into the
@@ -366,7 +366,7 @@ diff -Nur a/mobile/xul/app/mobile.js b/mobile/xul/app/mobile.js
pref("keyword.enabled", true);
-pref("keyword.URL", "https://www.google.com/m?ie=UTF-8&oe=UTF-8&sourceid=navclient&q=");
-+pref("keyword.URL","https://duckduckgo.com/lite/?q=");
++pref("keyword.URL","https://duckduckgo.com/html/?q=");
pref("accessibility.typeaheadfind", false);
pref("accessibility.typeaheadfind.timeout", 5000);
@@ -378,7 +378,7 @@ diff -Nur a/modules/libpref/src/init/all.js b/modules/libpref/src/init/all.js
*/
-pref("keyword.URL", "https://www.google.com/search?ie=UTF-8&oe=utf-8&q=");
-+pref("keyword.URL","https://duckduckgo.com/lite/?q=");
++pref("keyword.URL","https://duckduckgo.com/html/?q=");
pref("keyword.enabled", false);
pref("general.useragent.locale", "chrome://global/locale/intl.properties");
pref("general.useragent.compatMode.firefox", false);
--
cgit v1.2.3-54-g00ecf
From e62916728a432c558487dd94439b193a851bbe6b Mon Sep 17 00:00:00 2001
From: André Fabian Silva Delgado
Date: Tue, 27 Nov 2012 13:15:45 -0200
Subject: iceweasel-libre-17.0.1-2: removing unnecessary file
---
libre/iceweasel-libre/#libre.patch# | 438 ------------------------------------
1 file changed, 438 deletions(-)
delete mode 100755 libre/iceweasel-libre/#libre.patch#
diff --git a/libre/iceweasel-libre/#libre.patch# b/libre/iceweasel-libre/#libre.patch#
deleted file mode 100755
index 54b84229e..000000000
--- a/libre/iceweasel-libre/#libre.patch#
+++ /dev/null
@@ -1,438 +0,0 @@
-diff -urN iceweasel-16.0.orig/browser/app/profile/firefox.js iceweasel-16.0/browser/app/profile/firefox.js
---- iceweasel-16.0.orig/browser/app/profile/firefox.js 2012-10-05 20:01:58.000000000 -0300
-+++ iceweasel-16.0/browser/app/profile/firefox.js 2012-10-11 17:19:44.984225170 -0200
-@@ -37,11 +37,11 @@
- // Preferences for AMO integration
- pref("extensions.getAddons.cache.enabled", true);
- pref("extensions.getAddons.maxResults", 15);
--pref("extensions.getAddons.get.url", "https://services.addons.mozilla.org/%LOCALE%/firefox/api/%API_VERSION%/search/guid:%IDS%?src=firefox&appOS=%OS%&appVersion=%VERSION%");
--pref("extensions.getAddons.getWithPerformance.url", "https://services.addons.mozilla.org/%LOCALE%/firefox/api/%API_VERSION%/search/guid:%IDS%?src=firefox&appOS=%OS%&appVersion=%VERSION%&tMain=%TIME_MAIN%&tFirstPaint=%TIME_FIRST_PAINT%&tSessionRestored=%TIME_SESSION_RESTORED%");
--pref("extensions.getAddons.search.browseURL", "https://addons.mozilla.org/%LOCALE%/firefox/search?q=%TERMS%&platform=%OS%&appver=%VERSION%");
--pref("extensions.getAddons.search.url", "https://services.addons.mozilla.org/%LOCALE%/firefox/api/%API_VERSION%/search/%TERMS%/all/%MAX_RESULTS%/%OS%/%VERSION%/%COMPATIBILITY_MODE%?src=firefox");
--pref("extensions.webservice.discoverURL", "https://services.addons.mozilla.org/%LOCALE%/firefox/discovery/pane/%VERSION%/%OS%/%COMPATIBILITY_MODE%");
-+pref("extensions.getAddons.get.url", "http://www.gnu.org/s/gnuzilla/addons.html");
-+pref("extensions.getAddons.getWithPerformance.url", "http://www.gnu.org/s/gnuzilla/addons.html");
-+pref("extensions.getAddons.search.browseURL", "http://www.gnu.org/s/gnuzilla/addons.html");
-+pref("extensions.getAddons.search.url", "http://www.gnu.org/s/gnuzilla/addons.html");
-+pref("extensions.webservice.discoverURL", "http://www.gnu.org/s/gnuzilla/addons.html");
-
- // Blocklist preferences
- pref("extensions.blocklist.enabled", true);
-@@ -194,7 +194,7 @@
- pref("extensions.update.interval", 86400); // Check for updates to Extensions and
- // Themes every day
- // Non-symmetric (not shared by extensions) extension-specific [update] preferences
--pref("extensions.getMoreThemesURL", "https://addons.mozilla.org/%LOCALE%/firefox/getpersonas");
-+pref("extensions.getMoreThemesURL", "http://www.gnu.org/software/gnuzilla/addons.html#themes");
- pref("extensions.dss.enabled", false); // Dynamic Skin Switching
- pref("extensions.dss.switchPending", false); // Non-dynamic switch pending after next
- // restart.
-@@ -327,7 +327,7 @@
- pref("browser.download.panel.removeFinishedDownloads", false);
-
- // search engines URL
--pref("browser.search.searchEnginesURL", "https://addons.mozilla.org/%LOCALE%/firefox/search-engines/");
-+pref("browser.search.searchEnginesURL", "http://www.gnu.org/software/gnuzilla/addons.html#search%20engines");
-
- // pointer to the default engine name
- pref("browser.search.defaultenginename", "chrome://browser-region/locale/region.properties");
-@@ -584,7 +584,7 @@
- pref("accessibility.typeaheadfind.flashBar", 1);
-
- // plugin finder service url
--pref("pfs.datasource.url", "https://pfs.mozilla.org/plugins/PluginFinderService.php?mimetype=%PLUGIN_MIMETYPE%&appID=%APP_ID%&appVersion=%APP_VERSION%&clientOS=%CLIENT_OS%&chromeLocale=%CHROME_LOCALE%&appRelease=%APP_RELEASE%");
-+pref("pfs.datasource.url", "http://gnuzilla.gnu.org/plugins/PluginFinderService.php?mimetype=%PLUGIN_MIMETYPE%&appID=%APP_ID%&appVersion=%APP_VERSION%&clientOS=%CLIENT_OS%&chromeLocale=%CHROME_LOCALE%&appRelease=%APP_RELEASE%");
-
- // by default we show an infobar message when pages require plugins the user has not installed, or are outdated
- pref("plugins.hide_infobar_for_missing_plugin", false);
-diff -urN iceweasel-14.0.1.orig/browser/locales/en-US/chrome/browser-region/region.properties iceweasel-14.0.1/browser/locales/en-US/chrome/browser-region/region.properties
---- mozilla-release.orig/browser/locales/en-US/chrome/browser-region/region.properties 2012-06-01 09:03:48.000000000 -0300
-+++ mozilla-release/browser/locales/en-US/chrome/browser-region/region.properties 2012-06-15 02:17:00.978636665 -0300
-@@ -1,23 +1,23 @@
- # Default search engine
--browser.search.defaultenginename=Google
-+browser.search.defaultenginename=Duck Duck Go (HTML)
-
- # Search engine order (order displayed in the search bar dropdown)s
--browser.search.order.1=Google
--browser.search.order.2=Yahoo
--browser.search.order.3=Bing
-+browser.search.order.1=Duck Duck Go (HTML)
-+browser.search.order.2=Seeks Search
-+browser.search.order.3=YaCy
-
- # This is the default set of web based feed handlers shown in the reader
- # selection UI
--browser.contentHandlers.types.0.title=Google
--browser.contentHandlers.types.0.uri=http://fusion.google.com/add?feedurl=%s
--browser.contentHandlers.types.1.title=My Yahoo!
--browser.contentHandlers.types.1.uri=http://add.my.yahoo.com/rss?url=%s
-+browser.contentHandlers.types.0.title=
-+browser.contentHandlers.types.0.uri=about:blank
-+browser.contentHandlers.types.1.title=
-+browser.contentHandlers.types.1.uri=about:blank
-
- # URL for site-specific search engines
- # TRANSLATION NOTE: {moz:domain} and {searchTerms} are placeholders for the site
- # to be searched and the user's search query. Place them in the appropriate location
- # for your locale's URL but do not translate them.
--browser.search.siteSearchURL=https://www.google.com/search?ie=UTF-8&oe=UTF-8&sourceid=navclient&q=site%3A{moz:domain}+{searchTerms}
-+browser.search.siteSearchURL=https://duckduckgo.com/html/?q=site%3A{moz:domain}+{searchTerms}
-
- # increment this number when anything gets changed in the list below. This will
- # cause Firefox to re-read these prefs and inject any new handlers into the
-@@ -27,19 +27,19 @@
- gecko.handlerService.defaultHandlersVersion=3
-
- # The default set of protocol handlers for webcal:
--gecko.handlerService.schemes.webcal.0.name=30 Boxes
--gecko.handlerService.schemes.webcal.0.uriTemplate=http://30boxes.com/external/widget?refer=ff&url=%s
-+gecko.handlerService.schemes.webcal.0.name=
-+gecko.handlerService.schemes.webcal.0.uriTemplate=about:blank
-
- # The default set of protocol handlers for mailto:
--gecko.handlerService.schemes.mailto.0.name=Yahoo! Mail
--gecko.handlerService.schemes.mailto.0.uriTemplate=http://compose.mail.yahoo.com/?To=%s
--gecko.handlerService.schemes.mailto.1.name=Gmail
--gecko.handlerService.schemes.mailto.1.uriTemplate=https://mail.google.com/mail/?extsrc=mailto&url=%s
-+gecko.handlerService.schemes.mailto.0.name=
-+gecko.handlerService.schemes.mailto.0.uriTemplate=about:blank
-+gecko.handlerService.schemes.mailto.1.name=
-+gecko.handlerService.schemes.mailto.1.uriTemplate=about:blank
-
- # The default set of protocol handlers for irc:
--gecko.handlerService.schemes.irc.0.name=Mibbit
--gecko.handlerService.schemes.irc.0.uriTemplate=https://www.mibbit.com/?url=%s
-+gecko.handlerService.schemes.irc.0.name=Freenode
-+gecko.handlerService.schemes.irc.0.uriTemplate=https://webchat.freenode.net/
-
- # The default set of protocol handlers for ircs:
--gecko.handlerService.schemes.ircs.0.name=Mibbit
--gecko.handlerService.schemes.ircs.0.uriTemplate=https://www.mibbit.com/?url=%s
-+gecko.handlerService.schemes.ircs.0.name=Freenode
-+gecko.handlerService.schemes.ircs.0.uriTemplate=https://webchat.freenode.net/
-diff -urN iceweasel-13.0.orig/build/pgo/blueprint/elements.html iceweasel-13.0/build/pgo/blueprint/elements.html
---- mozilla-build.orig/build/pgo/blueprint/elements.html 2012-06-01 09:03:49.000000000 -0300
-+++ mozilla-build/build/pgo/blueprint/elements.html 2012-06-05 20:37:22.059133787 -0300
-@@ -143,7 +143,7 @@
-
-
- <a> anchor
-- <a> a + href
-+ <a> a + href
-
-
- <abbr> abbr - extended text when mouseover.
-diff -urN iceweasel-13.0.orig/dom/ipc/test.xul iceweasel-13.0/dom/ipc/test.xul
---- mozilla-build.orig/dom/ipc/test.xul 2012-06-01 09:03:55.000000000 -0300
-+++ mozilla-build/dom/ipc/test.xul 2012-06-05 20:40:59.453890004 -0300
-@@ -294,6 +294,6 @@
- oncommand="document.getElementById('page').QueryInterface(Components.interfaces.nsIFrameLoaderOwner).frameLoader.delayRemoteDialogs = this.checked;"/>
-
-
--
-+
-
-
-diff -Naur iceweasel-14.0.1.orig/mobile/android/app/mobile.js iceweasel-14.0.1.orig/mobile/android/app/mobile.js
---- mozilla-build.orig/mobile/android/app/mobile.js 2012-07-12 14:27:37.000000000 -0300
-+++ mozilla-build/mobile/android/app/mobile.js 2012-07-17 22:14:47.293560718 -0300
-@@ -226,13 +226,13 @@
- /* preferences for the Get Add-ons pane */
- pref("extensions.getAddons.cache.enabled", true);
- pref("extensions.getAddons.maxResults", 15);
--pref("extensions.getAddons.recommended.browseURL", "https://addons.mozilla.org/%LOCALE%/android/recommended/");
--pref("extensions.getAddons.recommended.url", "https://services.addons.mozilla.org/%LOCALE%/android/api/%API_VERSION%/list/featured/all/%MAX_RESULTS%/%OS%/%VERSION%");
--pref("extensions.getAddons.search.browseURL", "https://addons.mozilla.org/%LOCALE%/android/search?q=%TERMS%&platform=%OS%&appver=%VERSION%");
--pref("extensions.getAddons.search.url", "https://services.addons.mozilla.org/%LOCALE%/android/api/%API_VERSION%/search/%TERMS%/all/%MAX_RESULTS%/%OS%/%VERSION%/%COMPATIBILITY_MODE%");
--pref("extensions.getAddons.browseAddons", "https://addons.mozilla.org/%LOCALE%/android/");
--pref("extensions.getAddons.get.url", "https://services.addons.mozilla.org/%LOCALE%/android/api/%API_VERSION%/search/guid:%IDS%?src=mobile&appOS=%OS%&appVersion=%VERSION%");
--pref("extensions.getAddons.getWithPerformance.url", "https://services.addons.mozilla.org/%LOCALE%/android/api/%API_VERSION%/search/guid:%IDS%?src=mobile&appOS=%OS%&appVersion=%VERSION%&tMain=%TIME_MAIN%&tFirstPaint=%TIME_FIRST_PAINT%&tSessionRestored=%TIME_SESSION_RESTORED%");
-+pref("extensions.getAddons.recommended.browseURL", "http://www.gnu.org/s/gnuzilla/addons.html");
-+pref("extensions.getAddons.recommended.url", "http://www.gnu.org/s/gnuzilla/addons.html");
-+pref("extensions.getAddons.search.browseURL", "http://www.gnu.org/s/gnuzilla/addons.html");
-+pref("extensions.getAddons.search.url", "http://www.gnu.org/s/gnuzilla/addons.html");
-+pref("extensions.getAddons.browseAddons", "http://www.gnu.org/s/gnuzilla/addons.html");
-+pref("extensions.getAddons.get.url", "http://www.gnu.org/s/gnuzilla/addons.html");
-+pref("extensions.getAddons.getWithPerformance.url", "http://www.gnu.org/s/gnuzilla/addons.html");
-
- /* preference for the locale picker */
- pref("extensions.getLocales.get.url", "");
-@@ -259,7 +259,7 @@
- pref("dom.disable_window_find", true);
-
- pref("keyword.enabled", true);
--pref("keyword.URL", "");
-+pref("keyword.URL", "https://duckduckgo.com/lite/?q=");
-
- pref("accessibility.typeaheadfind", false);
- pref("accessibility.typeaheadfind.timeout", 5000);
-diff -urN iceweasel-13.0.orig/layout/ipc/test-ipcbrowser.xul iceweasel-13.0/layout/ipc/test-ipcbrowser.xul
---- mozilla-build.orig/layout/ipc/test-ipcbrowser.xul 2012-06-01 09:04:06.000000000 -0300
-+++ mozilla-build/layout/ipc/test-ipcbrowser.xul 2012-06-05 20:44:00.714006926 -0300
-@@ -69,6 +69,6 @@
- label="setViewportScale"/>
-
-
--
-
-diff -urN iceweasel-14.0.1.orig/mobile/xul/app/mobile.js iceweasel-14.0.1/mobile/xul/app/mobile.js
---- mozilla-build.orig/mobile/xul/app/mobile.js 2012-06-01 09:04:14.000000000 -0300
-+++ mozilla-build/mobile/xul/app/mobile.js 2012-06-05 20:48:20.193241600 -0300
-@@ -221,13 +221,12 @@
- /* preferences for the Get Add-ons pane */
- pref("extensions.getAddons.cache.enabled", true);
- pref("extensions.getAddons.maxResults", 15);
--pref("extensions.getAddons.recommended.browseURL", "https://addons.mozilla.org/%LOCALE%/mobile/recommended/");
--pref("extensions.getAddons.recommended.url", "https://services.addons.mozilla.org/%LOCALE%/mobile/api/%API_VERSION%/list/featured/all/%MAX_RESULTS%/%OS%/%VERSION%");
--pref("extensions.getAddons.search.browseURL", "https://addons.mozilla.org/%LOCALE%/mobile/search?q=%TERMS%&platform=%OS%&appver=%VERSION%");
--pref("extensions.getAddons.search.url", "https://services.addons.mozilla.org/%LOCALE%/mobile/api/%API_VERSION%/search/%TERMS%/all/%MAX_RESULTS%/%OS%/%VERSION%/%COMPATIBILITY_MODE%");
--pref("extensions.getAddons.browseAddons", "https://addons.mozilla.org/%LOCALE%/mobile/");
--pref("extensions.getAddons.get.url", "https://services.addons.mozilla.org/%LOCALE%/mobile/api/%API_VERSION%/search/guid:%IDS%?src=mobile&appOS=%OS%&appVersion=%VERSION%");
--pref("extensions.getAddons.getWithPerformance.url", "https://services.addons.mozilla.org/%LOCALE%/mobile/api/%API_VERSION%/search/guid:%IDS%?src=mobile&appOS=%OS%&appVersion=%VERSION%&tMain=%TIME_MAIN%&tFirstPaint=%TIME_FIRST_PAINT%&tSessionRestored=%TIME_SESSION_RESTORED%");
-+pref("extensions.getAddons.recommended.browseURL", "http://www.gnu.org/s/gnuzilla/addons.html");
-+pref("extensions.getAddons.recommended.url", "http://www.gnu.org/s/gnuzilla/addons.html");
-+pref("extensions.getAddons.search.browseURL", "http://www.gnu.org/s/gnuzilla/addons.html");
-+pref("extensions.getAddons.search.url", "http://www.gnu.org/s/gnuzilla/addons.html");
-+pref("extensions.getAddons.browseAddons", "http://www.gnu.org/s/gnuzilla/addons.html");
-+pref("extensions.getAddons.get.url", "http://www.gnu.org/s/gnuzilla/addons.html");
-
- /* preference for the locale picker */
- pref("extensions.getLocales.get.url", "");
-@@ -247,7 +246,7 @@
- pref("dom.disable_window_open_dialog_feature", true);
-
- pref("keyword.enabled", true);
--pref("keyword.URL", "https://www.google.com/m?ie=UTF-8&oe=UTF-8&sourceid=navclient&q=");
-+pref("keyword.URL", "https://duckduckgo.com/lite/?q=");
-
- pref("accessibility.typeaheadfind", false);
- pref("accessibility.typeaheadfind.timeout", 5000);
-diff -urN iceweasel-13.0.orig/mobile/locales/en-US/chrome/region.properties iceweasel-13.0/mobile/locales/en-US/chrome/region.properties
---- mozilla-release.orig/mobile/locales/en-US/chrome/region.properties 2012-06-01 09:04:14.000000000 -0300
-+++ mozilla-release/mobile/locales/en-US/chrome/region.properties 2012-06-15 02:17:43.446130868 -0300
-@@ -1,18 +1,18 @@
- # Default search engine
--browser.search.defaultenginename=Google
-+browser.search.defaultenginename=Duck Duck Go (Lite)
-
- # Search engine order (order displayed in the search bar dropdown)s
--browser.search.order.1=Google
-+browser.search.order.1=Duck Duck Go (Lite)
-
- # This is the default set of web based feed handlers shown in the reader
- # selection UI
--browser.contentHandlers.types.0.title=My Yahoo
--browser.contentHandlers.types.0.uri=http://add.my.yahoo.com/rss?url=%s
--browser.contentHandlers.types.1.title=Google
--browser.contentHandlers.types.1.uri=http://fusion.google.com/add?feedurl=%s
-+browser.contentHandlers.types.0.title=
-+browser.contentHandlers.types.0.uri=about:blank
-+browser.contentHandlers.types.1.title=
-+browser.contentHandlers.types.1.uri=about:blank
-
- # Keyword URL (for location bar searches)
--keyword.URL=https://www.google.com/search?ie=UTF-8&oe=UTF-8&sourceid=navclient&gfns=1&q=
-+keyword.URL=https://duckduckgo.com/lite/?q=site%3A{moz:domain}+{searchTerms}
-
- # increment this number when anything gets changed in the list below. This will
- # cause Firefox to re-read these prefs and inject any new handlers into the
-@@ -22,11 +22,11 @@
- gecko.handlerService.defaultHandlersVersion=2
-
- # The default set of protocol handlers for webcal:
--gecko.handlerService.schemes.webcal.0.name=30 Boxes
--gecko.handlerService.schemes.webcal.0.uriTemplate=http://30boxes.com/external/widget?refer=ff&url=%s
-+gecko.handlerService.schemes.webcal.0.name=
-+gecko.handlerService.schemes.webcal.0.uriTemplate=about:blank
-
- # The default set of protocol handlers for mailto:
--gecko.handlerService.schemes.mailto.0.name=Yahoo! Mail
--gecko.handlerService.schemes.mailto.0.uriTemplate=http://compose.mail.yahoo.com/?To=%s
--gecko.handlerService.schemes.mailto.1.name=Gmail
--gecko.handlerService.schemes.mailto.1.uriTemplate=https://mail.google.com/mail/?extsrc=mailto&url=%s
-+gecko.handlerService.schemes.mailto.0.name=
-+gecko.handlerService.schemes.mailto.0.uriTemplate=about:blank
-+gecko.handlerService.schemes.mailto.1.name=
-+gecko.handlerService.schemes.mailto.1.uriTemplate=about:blank
-diff -urN iceweasel-14.0.orig/modules/libpref/src/init/all.js iceweasel-14.0/modules/libpref/src/init/all.js
---- mozilla-build.orig/modules/libpref/src/init/all.js 2012-06-01 09:04:16.000000000 -0300
-+++ mozilla-build/modules/libpref/src/init/all.js 2012-06-05 20:55:41.569045759 -0300
-@@ -47,7 +47,7 @@
- // SYNTAX HINTS: dashes are delimiters. Use underscores instead.
- // The first character after a period must be alphabetic.
-
--pref("keyword.URL", "https://www.google.com/search?ie=UTF-8&oe=utf-8&q=");
-+pref("keyword.URL", "https://duckduckgo.com/lite/?q=");
- pref("keyword.enabled", false);
- pref("general.useragent.locale", "chrome://global/locale/intl.properties");
- pref("general.useragent.compatMode.firefox", false);
-diff -urN iceweasel-13.0.orig/toolkit/locales/en-US/chrome/global-region/region.properties iceweasel-13.0/toolkit/locales/en-US/chrome/global-region/region.properties
---- mozilla-build.orig/toolkit/locales/en-US/chrome/global-region/region.properties 2012-06-01 09:04:20.000000000 -0300
-+++ mozilla-build/toolkit/locales/en-US/chrome/global-region/region.properties 2012-06-05 20:58:59.068158482 -0300
-@@ -4,10 +4,10 @@
- pluginStartupMessage=Starting Plugin for type
-
- # plug-ins URLs
--more_plugins_label=mozilla.org
--more_plugins_url=https://pfs.mozilla.org/plugins/
--pluginupdates_label=mozilla.com/plugincheck
--pluginupdates_url=http://www.mozilla.com/plugincheck/
--plugindoc_label=plugindoc.mozdev.org
--plugindoc_url=http://plugindoc.mozdev.org/
-+more_plugins_label=
-+more_plugins_url=about:blank
-+pluginupdates_label=
-+pluginupdates_url=about:blank
-+plugindoc_label=
-+plugindoc_url=about:blank
-
-diff -urN iceweasel-14.0.1.orig/browser/locales/generic/profile/bookmarks.html.in iceweasel-14.0.1/browser/locales/generic/profile/bookmarks.html.in
---- mozilla-release.orig/browser/locales/generic/profile/bookmarks.html.in 2012-06-01 09:03:48.000000000 -0300
-+++ mozilla-release/browser/locales/generic/profile/bookmarks.html.in 2012-06-15 22:54:08.446274144 -0300
-@@ -11,13 +11,20 @@
-
@bookmarks_toolbarfolder@
- @bookmarks_toolbarfolder_description@
-
--
@getting_started@
-+ Parabola GNU/Linux-libre
-
--
@firefox_heading@
-+ Parabola GNU/Linux-libre
-
--
@firefox_help@
-- @firefox_customize@
-- @firefox_community@
-- @firefox_about@
-+ Parabola GNU/Linux-libre
-+ Parabola GNU/Linux-libre Packages
-+ Parabola GNU/Linux-libre Wiki
-+ Parabola GNU/Linux-libre Labs
-+
-+
Free Software Foundation
-+
-+
Free Software Foundation
-+ LibrePlanet
-+ Free addons
-+ h-node
-
-
-diff -urN iceweasel-13.0.orig/browser/base/content/abouthome/aboutHome.js iceweasel-13.0/browser/base/content/abouthome/aboutHome.js
---- mozilla-release.orig/browser/base/content/abouthome/aboutHome.js 2012-06-01 09:03:47.000000000 -0300
-+++ mozilla-release/browser/base/content/abouthome/aboutHome.js 2012-06-13 18:07:51.217531774 -0300
-@@ -38,104 +38,6 @@
- *
- * ***** END LICENSE BLOCK ***** */
-
--// If a definition requires additional params, check that the final search url
--// is handled correctly by the engine.
--const SEARCH_ENGINES = {
-- "Google": {
-- image: "data:image/png;base64," +
-- "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"
-- , params: "source=hp&channel=np"
-- }
--
--, "Яндекс":
-- {
-- image: "data:image/png;base64," +
-- "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"
-- }
--};
--
- // The process of adding a new default snippet involves:
- // * add a new entity to aboutHome.dtd
- // * add a for it in aboutHome.xhtml
-@@ -143,7 +45,7 @@
- // The part of the snippet will be linked to the corresponding url.
- const DEFAULT_SNIPPETS_URLS = [
- "http://www.mozilla.com/firefox/features/?WT.mc_ID=default1"
--, "https://addons.mozilla.org/firefox/?src=snippet&WT.mc_ID=default2"
-+, "http://www.gnu.org/software/gnuzilla/addons.html?src=snippet&WT.mc_ID=default2"
- ];
-
- const SNIPPETS_UPDATE_INTERVAL_MS = 86400000; // 1 Day.
--
cgit v1.2.3-54-g00ecf
From ba6fabfc73ead8f4f2c344e1f61e99b9a616457f Mon Sep 17 00:00:00 2001
From: André Fabian Silva Delgado
Date: Tue, 27 Nov 2012 14:12:36 -0200
Subject: kdebase-runtime-libre-4.9.3-1.1: adding ddg html support for KDE
---
libre/kdebase-runtime-libre/PKGBUILD | 7 +-
.../kdebase-runtime-libre/duckduckgo_html.desktop | 113 +++++++++++++++++++++
.../kdebase-runtime-libre/duckduckgo_lite.desktop | 4 +-
3 files changed, 121 insertions(+), 3 deletions(-)
create mode 100644 libre/kdebase-runtime-libre/duckduckgo_html.desktop
diff --git a/libre/kdebase-runtime-libre/PKGBUILD b/libre/kdebase-runtime-libre/PKGBUILD
index 80537f26f..164cd19e9 100644
--- a/libre/kdebase-runtime-libre/PKGBUILD
+++ b/libre/kdebase-runtime-libre/PKGBUILD
@@ -6,7 +6,7 @@
_pkgname=kdebase-runtime
pkgname=kdebase-runtime-libre
pkgver=4.9.3
-pkgrel=1
+pkgrel=1.1
pkgdesc="Plugins and applications necessary for the running of KDE applications (without non-privacy search providers)"
arch=('i686' 'x86_64' 'mips64el')
url='https://projects.kde.org/projects/kde/kde-runtime'
@@ -24,8 +24,10 @@ conflicts=("${_pkgname}")
provides=("${_pkgname}=${pkgver}")
install="${_pkgname}.install"
source=("http://download.kde.org/stable/${pkgver}/src/kde-runtime-${pkgver}.tar.xz"
+ 'duckduckgo_html.desktop'
'duckduckgo_lite.desktop')
sha1sums=('5245c1152680ad22dff21c44dad531eda736e769'
+ 'aa6f39f4b0ad3c110fd05cd6c41190afae9773dd'
'265d4ca95c3a022b5f6f1d5daea6f8e3a25dee85')
build() {
@@ -34,6 +36,9 @@ build() {
# Removing non-privacy search providers
rm -v kde-runtime-${pkgver}/kurifilter-plugins/ikws/searchproviders/{7digital,acronym,altavista,amazon{,_mp3},amg,austronaut,backports,baidu,bing,blip,cia,dbug,deb,duckduckgo{,_info,_shopping},facebook,ecosia,feedster,flickr,flickrcc,froogle,google,google_advanced,google_code,google_groups,google_images,google_lucky,google_maps,google_movie,google_news,gracenote,imdb,jeeves,katatudo,magnatune,metacrawler,msdn,nl-telephone,nl-teletekst,python,rpmfind,tvtome,uspto,vimeo,vivisimo,voila,yahoo,yahoo_image,yahoo_local,yahoo_shopping,yahoo_video,youtube}.desktop
+# Adding DuckDuckGo HTML
+ cp -v duckduckgo_html.desktop "kde-runtime-${pkgver}/kurifilter-plugins/ikws/searchproviders"
+
# Adding DuckDuckGo Lite
cp -v duckduckgo_lite.desktop "kde-runtime-${pkgver}/kurifilter-plugins/ikws/searchproviders"
diff --git a/libre/kdebase-runtime-libre/duckduckgo_html.desktop b/libre/kdebase-runtime-libre/duckduckgo_html.desktop
new file mode 100644
index 000000000..ba6a602ad
--- /dev/null
+++ b/libre/kdebase-runtime-libre/duckduckgo_html.desktop
@@ -0,0 +1,113 @@
+[Desktop Entry]
+Charset=
+Hidden=false
+Keys=duckduckgo,dd,dukgo
+Name=Duck Duck Go HTML
+Name[ar]=Duck Duck Go HTML
+Name[ast]=Duck Duck Go HTML
+Name[bg]=Duck Duck Go HTML
+Name[bn]=Duck Duck Go HTML
+Name[bs]=Dak dak go HTML
+Name[ca]=Duck Duck Go HTML
+Name[ca@valencia]=Duck Duck Go HTML
+Name[cs]=Duck Duck Go HTML
+Name[da]=Duck Duck Go HTML
+Name[de]=Duck Duck Go HTML
+Name[el]=Duck Duck Go HTML
+Name[en_GB]=Duck Duck Go HTML
+Name[eo]=Duck Duck Go HTML
+Name[es]=Duck Duck Go HTML
+Name[et]=Duck Duck Go HTML
+Name[eu]=Duck Duck Go HTML
+Name[fa]=Duck Duck Go HTML
+Name[fi]=Duck Duck Go HTML
+Name[fr]=Duck Duck Go HTML
+Name[ga]=Duck Duck Go HTML
+Name[gl]=Duck Duck Go HTML
+Name[gu]=Duck Duck Go HTML
+Name[he]=Duck Duck Go HTML
+Name[hi]=Duck Duck Go HTML
+Name[hr]=Duck Duck Go HTML
+Name[hu]=Duck Duck Go HTML
+Name[ia]=Duck Duck Go HTML
+Name[id]=Duck Duck Go HTML
+Name[is]=Duck Duck Go HTML
+Name[it]=Duck Duck Go HTML
+Name[ja]=Duck Duck Go HTML
+Name[kk]=Duck Duck Go HTML
+Name[km]=Duck Duck Go HTML
+Name[kn]=Duck Duck Go HTML
+Name[ko]=Duck Duck Go HTML
+Name[lt]=Duck Duck Go HTML
+Name[lv]=Duck Duck Go HTML
+Name[ml]=Duck Duck Go HTML
+Name[nb]=Duck Duck Go HTML
+Name[nds]=Duck Duck Go HTML
+Name[nl]=Duck Duck Go HTML
+Name[nn]=Duck Duck Go HTML
+Name[pa]=Duck Duck Go HTML
+Name[pl]=Duck Duck Go HTML
+Name[pt]=Duck Duck Go HTML
+Name[pt_BR]=Duck Duck Go HTML
+Name[ro]=Duck Duck Go HTML
+Name[ru]=Поиск Duck Duck Go HTML
+Name[si]=Duck Duck Go HTML
+Name[sk]=Duck Duck Go HTML
+Name[sl]=Duck Duck Go HTML
+Name[sr]=Duck Duck Go HTML
+Name[sr@ijekavian]=Duck Duck Go HTML
+Name[sr@ijekavianlatin]=Duck Duck Go HTML
+Name[sr@latin]=Duck Duck Go HTML
+Name[sv]=Duck Duck Go HTML
+Name[tg]=Duck Duck Go HTML
+Name[th]=Duck Duck Go HTML
+Name[tr]=Duck Duck Go HTML
+Name[ug]=Duck Duck Go HTML
+Name[uk]=Duck Duck Go HTML
+Name[vi]=Duck Duck Go HTML
+Name[wa]=Duck Duck Go HTML
+Name[x-test]=xxDuck Duck Go HTMLxx
+Name[zh_CN]=Duck Duck Go HTML
+Name[zh_TW]=Duck Duck Go HTML
+Query=http://duckduckgo.com/html/?q=\\{@}&t=KDE
+Query[bg]=http://duckduckgo.com/html/?q=\\{@}&t=KDE
+Query[bn]=http://duckduckgo.com/html/?q=\\{@}&t=KDE
+Query[ca]=http://duckduckgo.com/html/?q=\\{@}&t=KDE
+Query[cs]=http://duckduckgo.com/html/?q=\\{@}&t=KDE
+Query[da]=http://duckduckgo.com/html/?q=\\{@}&t=KDE
+Query[de]=http://duckduckgo.com/html/?q=\\{@}&t=KDE
+Query[el]=http://duckduckgo.com/html/?q=\\{@}&t=KDE
+Query[eo]=http://duckduckgo.com/html/?q=\\{@}&t=KDE
+Query[es]=http://duckduckgo.com/html/?q=\\{@}&t=KDE
+Query[et]=http://duckduckgo.com/html/?q=\\{@}&t=KDE
+Query[fi]=http://duckduckgo.com/html/?q=\\{@}&t=KDE
+Query[fr]=http://duckduckgo.com/html/?q=\\{@}&t=KDE
+Query[gl]=http://duckduckgo.com/html/?q=\\{@}&t=KDE
+Query[hi]=http://duckduckgo.com/html/?q=\\{@}&t=KDE
+Query[hu]=http://duckduckgo.com/html/?q=\\{@}&t=KDE
+Query[ia]=http://duckduckgo.com/html/?q=\\{@}&t=KDE
+Query[it]=http://duckduckgo.com/html/?q=\\{@}&t=KDE
+Query[kk]=http://duckduckgo.com/html/?q=\\{@}&t=KDE
+Query[km]=http://duckduckgo.com/html/?q=\\{@}&t=KDE
+Query[nb]=http://duckduckgo.com/html/?q=\\{@}&t=KDE
+Query[nl]=http://duckduckgo.com/html/?q=\\{@}&t=KDE
+Query[pa]=http://duckduckgo.com/html/?q=\\{@}&t=KDE
+Query[pl]=http://duckduckgo.com/html/?q=\\{@}&t=KDE
+Query[pt]=http://duckduckgo.com/html/?q=\\{@}&t=KDE
+Query[pt_BR]=http://duckduckgo.com/html/?q=\\{@}&t=KDE
+Query[ro]=http://duckduckgo.com/html/?q=\\{@}&t=KDE
+Query[ru]=http://duckduckgo.com/html/?q=\\{@}&t=KDE
+Query[sl]=http://duckduckgo.com/html/?q=\\{@}&t=KDE
+Query[sr]=http://duckduckgo.com/html/?q=\\{@}&t=KDE
+Query[sr@ijekavian]=http://duckduckgo.com/html/?q=\\{@}&t=KDE
+Query[sr@ijekavianlatin]=http://duckduckgo.com/html/?q=\\{@}&t=KDE
+Query[sr@latin]=http://duckduckgo.com/html/?q=\\{@}&t=KDE
+Query[sv]=http://duckduckgo.com/html/?q=\\{@}&t=KDE
+Query[tr]=http://duckduckgo.com/html/?q=\\{@}&t=KDE
+Query[uk]=http://duckduckgo.com/html/?q=\\{@}&t=KDE
+Query[wa]=http://duckduckgo.com/html/?q=\\{@}&t=KDE
+Query[x-test]=xxhttp://duckduckgo.com/html/?q=\\{@}&t=KDExx
+Query[zh_CN]=http://duckduckgo.com/html/?q=\\{@}&t=KDE
+Query[zh_TW]=http://duckduckgo.com/html/?q=\\{@}&t=KDE
+ServiceTypes=SearchProvider
+Type=Service
diff --git a/libre/kdebase-runtime-libre/duckduckgo_lite.desktop b/libre/kdebase-runtime-libre/duckduckgo_lite.desktop
index 2b875b4c1..0da670dbe 100644
--- a/libre/kdebase-runtime-libre/duckduckgo_lite.desktop
+++ b/libre/kdebase-runtime-libre/duckduckgo_lite.desktop
@@ -1,13 +1,13 @@
[Desktop Entry]
Charset=
Hidden=false
-Keys=duckduckgo,dd,dukgo
+Keys=duckduckgolite,ddlite,dukgolite
Name=Duck Duck Go Lite
Name[ar]=Duck Duck Go Lite
Name[ast]=Duck Duck Go Lite
Name[bg]=Duck Duck Go Lite
Name[bn]=Duck Duck Go Lite
-Name[bs]=Dak dak go lite
+Name[bs]=Dak dak go Lite
Name[ca]=Duck Duck Go Lite
Name[ca@valencia]=Duck Duck Go Lite
Name[cs]=Duck Duck Go Lite
--
cgit v1.2.3-54-g00ecf