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

11 files changed, 972 insertions, 705 deletions

diff --git a/kernels/gradm/PKGBUILD b/kernels/gradm/PKGBUILD
deleted file mode 100644
index 6ca4aacd9..000000000
--- a/kernels/gradm/PKGBUILD
+++ /dev/null
@@ -1,36 +0,0 @@
-# Contributors:
-#   Jonathan Liu <net147@gmail.com>
-#   henning mueller <henning@orgizm.net>
-#   s1gma, Ahmad24, maxrp
-
-pkgname=gradm
-pkgver=3.0
-_timestamp=201401291757
-pkgrel=4
-pkgdesc='Administrative interface for the grsecurity Role Based Access Control system'
-arch=(i686 x86_64 mips64el)
-url=http://grsecurity.net/
-license=(GPL2)
-depends=(pam)
-source=(
-  http://grsecurity.net/stable/$pkgname-$pkgver-$_timestamp.tar.gz
-  learn_config
-  policy
-)
-
-build() {
-  cd "$srcdir/$pkgname"
-  sed -i -e 's/^CFLAGS :=/CFLAGS +=/' -e 's:sbin:usr/bin:' Makefile
-  make
-}
-
-package() {
-  cd "$srcdir/$pkgname"
-  make DESTDIR="$pkgdir" install
-  cp "$startdir"/{learn_config,policy} "$pkgdir/etc/grsec"
-  rm -rf "$pkgdir/dev"
-}
-
-sha256sums=('9c99714e6d10797a7348c6ffe2561dfcfe5e7659c9d86118d381b8bdb09ae7a6'
-            'ec8e824e8a29a67be76bf853814ee85e80c4063009e5693d5db8cdb45bd45813'
-            '61c0e84098e8386e5496dafce559558adef32e2a4a1241a9fa3bd56eab192dcd')
diff --git a/kernels/gradm/learn_config b/kernels/gradm/learn_config
deleted file mode 100644
index 24c4cbc25..000000000
--- a/kernels/gradm/learn_config
+++ /dev/null
@@ -1,169 +0,0 @@
-#This configuration file aids the learning process by tweaking
-#the learning algorithm for specific paths.
-#
-#It accepts lines in the form of <command> <pathname>
-#Where <command> can be inherit-learn, no-learn, inherit-no-learn,
-#high-reduce-path, dont-reduce-path, protected-path, high-protected-path,
-#read-protected-path, and always-reduce-path
-#
-#inherit-learn, no-learn, and inherit-no-learn operate only with
-#full learning
-#
-#high-reduce-path, dont-reduce-path, always-reduce-path, protected-path, 
-#and high-protected-path operate on both full and and regular learning 
-#(subject and role learning)
-#
-#inherit-learn changes the learning process for the specified path
-#by throwing all learned accesses for every binary executed by the
-#processes contained in the pathname into the subject specified
-#by the pathname.  This is useful for cron in the case of full
-#system learning, so that scripts that eventually end up executing
-#mv or rm with privilege don't cause the root policy to grant
-#that privilege to mv or rm in all cases.
-#
-#no-learn allows processes within the path to perform any operation
-#that normal system usage would allow without restriction.  If
-#a process is generating a huge number of learning logs, it may be
-#best to use this command on that process and configure its policy
-#manually.
-#
-#inherit-no-learn combines the above two cases, such that processes
-#within the specified path will be able to perform any normal system
-#operation without restriction as will any binaries executed by
-#these processes.
-#
-#high-reduce-path modifies the heuristics of the learning process
-#to weight in favor of reducing accesses for this path
-#
-#dont-reduce-path modifies the heuristics of the learning process
-#so that it will never reduce accesses for this path
-#
-#always-reduce-path modifies the heuristics of the learning process
-#so that the path specified will always have all files and directories
-#within it reduced to the path specified.
-#
-#protected-path specifies a path on your system that is considered an
-#important resource.  Any process that modifies one of these paths
-#is given its own subject in the learning process, facilitating
-#a secure policy.
-#
-#read-protected-path specifies a path on your system that contains 
-#sensitive information.  Any process that reads one of these paths is
-#given its own subject in the learning process, facilitating a secure
-#policy.
-#
-#high-protected-path specifies a path that should be hidden from
-#all processes but those that access it directly.  It is recommended
-#to use highly sensitive files for this command.
-#
-#regular expressions are not supported for pathnames in this config file
-#
-#
-# uncomment this next line if you don't wish to generate a policy that 
-# restricts roles to specific IP ranges:
-# dont-learn-allowed-ips
-#
-# to write out your generated policy such that roles are split into separate
-# files by the name of the role (within user/group directories), uncomment
-# the next line:
-# split-roles
-
-always-reduce-path /dev/pts
-always-reduce-path /var/spool/qmailscan/tmp
-always-reduce-path /var/spool/exim4
-always-reduce-path /var/run/screen
-always-reduce-path /usr/share/locale
-always-reduce-path /usr/share/zoneinfo
-always-reduce-path /usr/share/terminfo
-always-reduce-path /tmp
-always-reduce-path /var/tmp
-
-high-reduce-path /dev/.udev
-high-reduce-path /dev/mapper
-high-reduce-path /dev/snd
-high-reduce-path /proc
-high-reduce-path /usr/lib
-high-reduce-path /usr/lib/tls
-high-reduce-path /usr/lib/libreoffice
-high-reduce-path /usr/lib32
-high-reduce-path /usr/lib32/tls
-high-reduce-path /usr/lib64
-high-reduce-path /usr/lib64/tls
-high-reduce-path /var/lib
-high-reduce-path /usr/bin
-high-reduce-path /usr/sbin
-high-reduce-path /usr/local/share
-high-reduce-path /usr/local/bin
-high-reduce-path /usr/local/sbin
-high-reduce-path /usr/local/etc
-high-reduce-path /usr/local/lib
-high-reduce-path /usr/share
-high-reduce-path /usr/X11R6/lib
-high-reduce-path /var/lib/openldap-data
-high-reduce-path /var/lib/krb5kdc
-
-dont-reduce-path /
-dont-reduce-path /home
-dont-reduce-path /dev
-dont-reduce-path /usr
-dont-reduce-path /var
-dont-reduce-path /opt
-
-protected-path /boot
-protected-path /dev/log
-protected-path /etc
-protected-path /opt
-protected-path /root
-protected-path /run
-protected-path /sys
-protected-path /usr
-protected-path /var
-
-read-protected-path /etc/ssh
-read-protected-path /proc/kallsyms
-read-protected-path /proc/kcore
-read-protected-path /proc/slabinfo
-read-protected-path /proc/modules
-read-protected-path /usr/lib/modules
-read-protected-path /usr/lib64/modules
-read-protected-path /boot
-read-protected-path /etc/shadow
-read-protected-path /etc/shadow-
-read-protected-path /etc/gshadow
-read-protected-path /etc/gshadow-
-read-protected-path /sys
-
-high-protected-path /etc/ssh
-high-protected-path /proc/kcore
-high-protected-path /proc/sys
-high-protected-path /proc/bus
-high-protected-path /proc/slabinfo
-high-protected-path /proc/modules
-high-protected-path /proc/kallsyms
-high-protected-path /etc/passwd
-high-protected-path /etc/shadow
-high-protected-path /var/backups
-high-protected-path /etc/shadow-
-high-protected-path /etc/gshadow
-high-protected-path /etc/gshadow-
-high-protected-path /var/log
-high-protected-path /dev/mem
-high-protected-path /dev/kmem
-high-protected-path /dev/port
-high-protected-path /dev/log
-high-protected-path /sys
-high-protected-path /etc/ppp
-high-protected-path /etc/samba/smbpasswd
-#to protect kernel images
-high-protected-path /boot
-high-protected-path /usr/lib/modules
-high-protected-path /usr/lib64/modules
-high-protected-path /usr/src
-
-inherit-learn /etc/cron.d
-inherit-learn /etc/cron.hourly
-inherit-learn /etc/cron.daily
-inherit-learn /etc/cron.weekly
-inherit-learn /etc/cron.monthly
-inherit-learn /etc/init.d
-inherit-learn /etc/rc.d/init.d
diff --git a/kernels/gradm/policy b/kernels/gradm/policy
deleted file mode 100644
index 55a5811c8..000000000
--- a/kernels/gradm/policy
+++ /dev/null
@@ -1,487 +0,0 @@
-#sample default policy for grsecurity
-#
-# Role flags:
-# A -> This role is an administrative role, thus it has special privilege normal
-#      roles do not have.  In particular, this role bypasses the 
-#      additional ptrace restrictions
-# N -> Don't require authentication for this role.  To access
-#      the role, use gradm -n <rolename>
-# s -> This role is a special role, meaning it does not belong to a
-#      user or group, and does not require an enforced secure policy
-#      base to be included in the ruleset
-# u -> This role is a user role
-# g -> This role is a group role
-# G -> This role can use gradm to authenticate to the kernel
-#      A policy for gradm will automatically be added to the role
-# T -> Enable TPE for this role
-# l -> Enable learning for this role
-# P -> Use PAM authentication for this role.
-# R -> Enable persistence of special role.  Normal special roles will
-#      be removed upon exit of the process that entered the role, or
-#      upon unauth (this is what changes the apache process' role back 
-#      to its normal role after being restarted from the admin role, for
-#      instance).  Role persistence allows a special role to be used for
-#      system shutdown, as the point at which the admin's shell/SSH 
-#      session is terminated won't cause the rest of the shutdown 
-#      sequence to execute with reduced privilege.  Do *NOT* use this 
-#      flag with any role that does anything but shut the system down.
-#      This role will also be transferred to the init process upon
-#      writing to /dev/initctl.  This allows init to execute the rc 
-#      scripts for shutdown with the necessary privilege.
-#      For usability reasons, we allow the removal of persistence through
-#      the normal unauth process (so persistence only survives exit).
-#
-# a role can only be one of user, group, or special
-#
-# role_allow_ip IP/optional netmask
-# eg: role_allow_ip 192.168.1.0/24
-# You can have as many of these per role as you want
-# They restrict the use of a role to a list of IPs.  If a user
-# is on the system that would normally get the role does not
-# belong to those lists of IPs, the system falls back through
-# its method of determining a role for the user
-#
-# Role hierarchy
-# user -> group -> default
-# First a user role attempts to match, if one is not found,
-# a group role attempts to match, if one is not found,
-# the default role is used.
-#
-# role_transitions <special role 1> <special role 2> ... <special role n>
-# eg: role_transitions www_admin dns_admin
-#
-# role transitions specify which special roles a given role is allowed
-# to authenticate to.  This applies to special roles that do not
-# require password authentication as well.  If a user tries to
-# authenticate to a role that is not within his transition table, he
-# will receive a permission denied error
-#
-# Nested subjects
-# subject /bin/su:/bin/bash:/bin/cat
-#	  / rwx
-#	  +CAP_ALL
-# grant privilege to specific processes if they are executed
-# within a trusted path.  In this case, privilege is
-# granted if /bin/cat is executed from /bin/bash, which is
-# executed from /bin/su.
-#
-# Configuration inheritance on nested subjects
-# nested subjects inherit rules from their parents.  In the
-# example above, the nested subject would inherit rules
-# from the nested subject for /bin/su:/bin/bash,
-# and the subject /bin/su
-# View the 1.9.x documentation for more information on
-# configuration inheritance
-#
-# new object modes:
-# m -> allow creation of setuid/setgid files/directories
-#      and modification of files/directories to be setuid/setgid
-# M -> audit the setuid/setgid creation/modification
-# c -> allow creation of the file/directory
-# C -> audit the creation
-# d -> allow deletion of the file/directory
-# D -> audit the deletion
-# p -> reject all ptraces to this object
-# l -> allow a hardlink at this path
-#	(hardlinking requires at a minimum c and l modes, and the target
-#	 link cannot have any greater permission than the source file)
-# L -> audit link creation
-# f -> needed to mark the pipe used for communication with init
-#      to transfer the privilege of the persistent role; only valid
-#      within a persistent role.  Transfer only occurs when the file is 
-#      opened for writing
-#
-# new subject modes:
-# O -> disable "writable library" restrictions for this task
-# t -> allow this process to ptrace any process (use with caution)
-# r -> relax ptrace restrictions (allows process to ptrace processes
-#      other than its own descendants)
-# i -> enable inheritance-based learning for this subject, causing
-#      all accesses of this subject and anything it executes to be placed
-#      in this subject, and inheritance flags added to executable objects
-#      in this subject
-# a -> allow this process to talk to the /dev/grsec device
-# s -> enable AT_SECURE when entering this subject
-#      (enables the same environment sanitization that occurs in glibc
-#	upon execution of a suid binary)
-# x -> allows executable anonymous shared memory for this subject
-#
-# user/group transitions:
-# You may now specify what users and groups a given subject can
-# transition to.  This can be done on an inclusive or exclusive basis.
-# Omitting these rules allows a process with proper privilege granted by
-# capabilities to transition to any user/group.
-#
-# Examples:
-# subject /bin/su
-# user_transition_allow root spender
-# group_transition_allow root spender
-# subject /bin/su
-# user_transition_deny evilhacker
-# subject /bin/su
-# group_transition_deny evilhacker1 evilhacker2
-#
-# Domains:
-# With domains you can combine users that don't share a common
-# GID as well as groups so that they share a single policy
-# Domains work just like roles, with the only exception being that
-# the line starting with "role" is replaced with one of the following:
-# domain somedomainname u user1 user2 user3 user4 ... usern
-# domain somedomainname g group1 group2 group3 group4 ... groupn
-#
-# Inverted socket policies:
-# Rules such as
-# connect ! www.google.com:80 stream tcp
-# are now allowed, which allows you to specify that a process can connect to anything
-# except to port 80 of www.google.com with a stream tcp socket
-# the inverted socket matching also works on bind rules
-#
-# INADDR_ANY overriding
-# You can now force a given subject to bind to a particular IP address on the machine
-# This is useful for some chrooted environments, to ensure that the source IP they
-# use is one of your choosing
-# to use, add a line like:
-# ip_override 192.168.0.1
-#
-# Per-interface socket policies:
-# Rules such as
-# bind eth1:80 stream tcp
-# bind eth0#1:22 stream tcp
-# are now allowed, giving you the ability to tie specific socket rules 
-# to a single interface (or by using the inverted rules, all but one 
-# interface).  Virtual interfaces are specified by the <ifname>#<vindex>
-# syntax.  If an interface is specified, no IP/netmask or host may be
-# specified for the rule.
-#
-# Allowing additional socket families:
-# Before v2.2.1 of the RBAC system, a subject that specified
-# connect/bind rules limited only the socket usage of IPv4, allowing
-# any other socket families to be used.  Starting with v2.2.1 of the 
-# RBAC system, when connect/bind rules are used, additional rules
-# will be required to unlock the use of additional socket families 
-# (outside of the common unix family).  Multiple families can be
-# specified per line.
-# To enable use of IPv6, add the line:
-# sock_allow_family ipv6
-# To enable use of netlink, add the line:
-# sock_allow_family netlink
-# To enable all other families, add the line:
-# sock_allow_family all
-#
-# New learning system:
-# To learn on a given subject: add l (the letter l, not the number 1)
-# to the subject mode
-# If you want to learn with the most restrictive policy, use the 
-# following:
-# subject /path/to/bin lo
-#    / h
-#    -CAP_ALL
-#    connect disabled
-#    bind disabled
-# Resource learning is also supported, so lines like
-#    RES_AS 0 0
-# can be used to learn a particular resource
-#
-# To learn on a given role, add l to the role mode
-# For both of these, to enable learning, enable the system like:
-# gradm -L /etc/grsec/learning.logs -E
-# and then generate the rules after disabling the system after the 
-# learning phase with:
-# gradm -L /etc/grsec/learning.logs -O /etc/grsec/policy
-# To use full system learning, enable the system like:
-# gradm -F -L /etc/grsec/learning.logs
-# and then generate the rules after disabling the system after the 
-# learning phase with:
-# gradm -F -L /etc/grsec/learning.logs -O /etc/grsec/policy
-#
-# New PaX flag format (replaces PaX subject flags):
-# PaX flags can be forced on or off, regardless of the flags on the 
-# binary, by using + or - before the following PaX flag names:
-# PAX_SEGMEXEC
-# PAX_PAGEEXEC
-# PAX_MPROTECT
-# PAX_RANDMMAP
-# PAX_EMUTRAMP
-#
-# New feature for easier policy maintenance:
-# replace <variable name> <replace string>
-# e.g.:
-# replace CVSROOT /home/cvs
-# now $(CVSROOT) can be used in any subject or object pathname, like:
-# $(CVSROOT)/grsecurity r
-# This will translate to /home/cvs/grsecurity r
-# This feature makes it easier to update policies by naming specific
-# paths by their function, then only having to update those paths once
-# to have it affect a large number of subjects/objects.
-#
-# capability auditing / log suppression
-# use of a capability can be audited by adding "audit" to the line, eg:
-# +CAP_SYS_RAWIO audit
-# log suppression for denial of a capbility can be done by adding "suppress":
-# -CAP_SYS_RAWIO suppress
-#
-# Per-role umask enforcement:
-# If you have a user that you want to be assured cannot accidentally
-# create a file that others can read (a confidentiality issue)
-# add the following under the role declaration:
-# role_umask 077
-# any normal octal umask may be specified
-# Note that unlike the normal umask, this umask will also apply
-# to the permissions one can chmod/fchmod a file to
-#
-# Note that the omission of any feature of a role or subject
-# results in a default-allow
-# For instance, if no capability rules are added, an implicit +CAP_ALL is used
-#
-# Commonly-used objects can be defined and used in multiple subjects
-# As an example, we'll create a variable out of a list of objects
-# and their associated permissions that RBAC enforces
-define grsec_denied {
-	/boot				h
-	/dev/grsec			h
-	/dev/kmem			h
-	/dev/mem			h
-	/dev/port			h
-	/etc/grsec			h
-	/proc/kcore			h
-	/proc/slabinfo		h
-	/proc/modules		h
-	/proc/kallsyms		h
-	# hide and suppress logs about accessing this path
-	/usr/lib/modules 	hs
-	/etc/ssh			h
-}
-# usage:
-# $grsec_denied
-
-role shutdown sARG
-subject / rvka
-	/
-	/dev
-	/dev/urandom	r
-	/dev/random		r
-	/etc			r
-	/usr			rx
-	/proc			r
-	$grsec_denied
-	-CAP_ALL
-	connect disabled
-	bind disabled
-
-subject /usr/lib/systemd/systemd rvkao
-	/ rwcdmlxi
-subject /usr/bin/systemctl rvkao
-	/ rwcdmlxi
-	/dev/initctl rwf
-	/run/initctl rwf
-
-# Make sure to unauthenticate with gradm -u from
-# the admin role after restarting a service
-# The service started will run with admin
-# privileges until you run gradm -u or your shell exits
-
-role admin sA
-subject / rvka
-	/ rwcdmlxi
-
-role default G
-role_transitions admin shutdown
-subject /
-	/		r
-	/opt		rx
-	/home		rwxcd
-	/mnt		rw
-	/dev
-	/dev/urandom	r
-	/dev/random	r
-	/dev/zero	rw
-	/dev/input	rw
-	/dev/psaux	rw
-	/dev/null	rw
-	/dev/tty?	rw
-	/dev/console	rw
-	/dev/tty	rw
-	/dev/pts	rw
-	/dev/ptmx	rw
-	/dev/dsp	rw
-	/dev/mixer	rw
-	/dev/initctl	rw
-	/dev/fd0	r
-	/dev/cdrom	r
-	/usr		rx
-# compilation of kernel code should be done within the admin role	
-	/usr/src	h
-	/etc		rx
-	/proc		rwx
-	/proc/sys	r
-	/sys		h
-	/root		r
-	/run		r
-	/tmp		rwcd
-	/var		rwxcd
-	/var/tmp	rwcd
-	/var/log	r
-# hide the kernel images and modules
-	$grsec_denied
-
-# if sshd needs to be restarted, it can be done through the admin role
-# restarting sshd should be followed immediately by a gradm -u
-	/usr/sbin/sshd
-
-	/home/*/.gem/ruby/2.0.0/bin		rx
-	/home/*/.rbenv/shims			rx
-	/home/*/.rbenv/versions*/bin	rx
-	/home/*/.cabal/bin				rx
-	/home/*/dev/env					rx
-
-	-CAP_KILL
-	-CAP_SYS_TTY_CONFIG
-	-CAP_LINUX_IMMUTABLE
-	-CAP_NET_RAW
-	-CAP_MKNOD
-	-CAP_SYS_ADMIN
-	-CAP_SYS_RAWIO
-	-CAP_SYS_MODULE
-	-CAP_SYS_PTRACE
-	-CAP_NET_ADMIN
-	-CAP_NET_BIND_SERVICE
-	-CAP_NET_RAW
-	-CAP_SYS_CHROOT
-	-CAP_SYS_BOOT
-	-CAP_SETFCAP
-	-CAP_SYSLOG
-
-#	RES_AS 100M 100M
-
-#	connect 192.168.1.0/24:22 stream tcp
-#	bind	0.0.0.0 stream dgram tcp udp
-
-# the d flag protects /proc fd and mem entries for sshd
-# all daemons should have 'p' in their subject mode to prevent
-# an attacker from killing the service (and restarting it with trojaned
-# config file or taking the port it reserved to run a trojaned service)
-
-subject /usr/sbin/sshd dpo
-	/
-	/*		h
-	/bin/bash	x
-	/dev		h
-	/dev/log	rw
-	/dev/random	r
-	/dev/urandom	r
-	/dev/null	rw
-	/dev/ptmx	rw
-	/dev/pts	rw
-	/dev/tty	rw
-	/dev/tty?	rw
-	/etc		r
-	/etc/grsec	h
-	/home
-	/home/*/.ssh/authorized_keys r
-	/root
-	/proc		r
-	/proc/*/oom_adj rw
-	/proc/kcore	h
-	/proc/sys	h
-	/proc/sys/kernel/ngroups_max r
-	/selinux	r
-	/usr/lib	rx
-	/usr/share/zoneinfo r
-	/var/log
-	/var/mail
-	/var/log/lastlog	rw
-	/var/log/wtmp		w
-	/var/run
-	/run
-	/var/run/sshd
-	/var/run/utmp		rw
-	/var/run/utmpx		rw
-	/var/run/.nscd_socket	rw
-
-	-CAP_ALL
-	+CAP_CHOWN
-	+CAP_SETGID
-	+CAP_SETUID
-	+CAP_SYS_CHROOT
-	+CAP_SYS_RESOURCE
-	+CAP_SYS_TTY_CONFIG
-	+CAP_AUDIT_WRITE
-	# to access user keys
-	+CAP_DAC_OVERRIDE
-
-subject /usr/bin/Xorg
-	/dev/mem	rw
-
-	+CAP_SYS_ADMIN
-	+CAP_SYS_TTY_CONFIG
-	+CAP_SYS_RAWIO
-
-subject /usr/bin/ssh
-	/etc/ssh/ssh_config r
-
-subject /usr/bin/postgres
-	/dev/log rw
-
-subject /usr/bin/exim
-	/dev/log rw
-
-subject /usr/sbin/syslog-ng
-	+CAP_SYS_ADMIN
-
-subject /usr/sbin/rsyslogd
-	+CAP_SYS_ADMIN
-
-subject /usr/sbin/cron
-	/dev/log rw
-
-subject /usr/sbin/crond
-	/dev/log rw
-
-subject /bin/login
-	/dev/log rw
-	/var/log/wtmp w
-	/var/log/faillog rwcd
-
-subject /bin/su
-	/dev/log rw
-
-subject /usr/bin/sudo
-	/dev/log rw
-
-subject /sbin/agetty
-	/var/log/wtmp w
-
-subject /sbin/init
-	/var/log/wtmp w
-
-subject /usr/bin/xauth
-	/home r
-	/home/*/.Xauthority-* rwcdl
-
-# prevent ld.so breakouts of subjects with /lib rx
-
-# many distros clutter up /lib with shell scripts
-# that can be easily hijacked for malicious purposes
-subject /usr/lib o
-	/ h
-	-CAP_ALL
-	connect disabled
-	bind disabled
-
-subject /usr/lib32 o
-	/ h
-	-CAP_ALL
-	connect disabled
-	bind disabled
-
-subject /usr/lib/ld-linux.so.2 o
-	/ h
-	-CAP_ALL
-	connect disabled
-	bind disabled
-
-subject /usr/lib/ld-linux-x86-64.so.2 o
-	/ h
-	-CAP_ALL
-	connect disabled
-	bind disabled
diff --git a/libre/kipi-plugins-libre/PKGBUILD b/libre/kipi-plugins-libre/PKGBUILD
new file mode 100644
index 000000000..dcbbdc492
--- /dev/null
+++ b/libre/kipi-plugins-libre/PKGBUILD
@@ -0,0 +1,59 @@
+# $Id: PKGBUILD 211141 2014-04-17 06:54:31Z andrea $
+# Maintainer: Ronald van Haren <ronald@archlinux.org>
+# Contributor: Andrea Scarpino <andrea@archlinux.org>
+# Contributor: Tobias Powalowski <tpowa@archlinux.org>
+# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
+# Contributor (Parabola): Márcio Silva <coadde@parabola.nu>
+
+pkgbase=digikam
+_pkgname=kipi-plugins
+pkgname=kipi-plugins-libre
+pkgver=3.5.0
+pkgrel=4
+pkgdesc="A collection of plugins extending the KDE graphics and image applications as digiKam, without nonfree jAlbum and SimpleViewer support"
+arch=('i686' 'x86_64' 'mips64el')
+license=('GPL')
+url="http://www.digikam.org/"
+replaces=$_pkgname
+conflicts=$_pkgname
+provides=$_pkgname=$pkgver
+makedepends=('kdepimlibs' 'libkexiv2' 'libkdcraw' 'libkipi' 'libksane' 'liblqr'
+             'kdeedu-marble' 'opencv' 'boost' 'libgpod' 'qjson' 'hugin' 'libgphoto2'
+             'cmake' 'automoc4' 'doxygen' 'lensfun' 'qt-gstreamer' 'imagemagick' 'eigen')
+depends=('kdebase-runtime' 'kdepimlibs' 'libkdcraw' 'libkipi' 'libksane' 'libkexiv2')
+optdepends=('libkgeomap: Geolocalize tool'
+            'libmediawiki: MediaWiki Export plugin'
+            'libkvkontakte: VKontakte.ru Exporter plugin'
+            'libgpod: iPodExport plugin'
+            'opencv: Remove Red Eyes plugin'
+            'imagemagick: Video SlideShow plugin'
+            'qt-gstreamer: Video SlideShow plugin')
+options=('staticlibs')
+install=kipi-plugins.install
+source=("http://download.kde.org/stable/${pkgbase}/${pkgbase}-${pkgver}.tar.bz2")
+sha1sums=('9e44fcf219312cbcbbaee0cc9a7f460a01769224')
+
+prepare() {
+  cd ${srcdir}/${pkgbase}-${pkgver}
+  sed -i '\|flashexport|d
+          \|jalbumexport|d
+         ' extra/kipi-plugins/CMakeLists.txt
+  cd ..
+  mkdir build
+}
+
+build() {
+  cd build
+  cmake ../${pkgbase}-${pkgver} \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DCMAKE_SKIP_RPATH=ON \
+    -DBUILD_tests=OFF \
+    -DDIGIKAMSC_USE_PRIVATE_KDEGRAPHICS=OFF
+  make
+}
+
+package() {
+  cd build/extra/kipi-plugins
+  make DESTDIR="${pkgdir}" install
+}
diff --git a/libre/kipi-plugins-libre/kipi-plugins.install b/libre/kipi-plugins-libre/kipi-plugins.install
new file mode 100644
index 000000000..81ce5c4b0
--- /dev/null
+++ b/libre/kipi-plugins-libre/kipi-plugins.install
@@ -0,0 +1,12 @@
+post_install() {
+	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+    update-desktop-database -q
+}
+
+post_upgrade() {
+	post_install
+}
+
+post_remove() {
+	post_install
+}
diff --git a/libre/linux-libre-tools/PKGBUILD b/libre/linux-libre-tools/PKGBUILD
index 436f65ae3..ef8516155 100644
--- a/libre/linux-libre-tools/PKGBUILD
+++ b/libre/linux-libre-tools/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 108676 2014-03-31 23:08:08Z seblu $
+# $Id: PKGBUILD 109662 2014-04-17 21:37:35Z seblu $
 # Maintainer: Sébastien Luttringer <seblu@archlinux.org>
 # Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
 
@@ -18,7 +18,7 @@ _basekernel=3.14
 #_sublevel=3
 #_pkgver=$_basekernel.$_sublevel
 pkgver=$_basekernel
-pkgrel=1
+pkgrel=2
 license=('GPL2')
 arch=('i686' 'x86_64' 'mips64el')
 url='http://linux-libre.fsfla.org/'
@@ -27,7 +27,7 @@ options=('!strip')
 # kernel source deps
 makedepends=('asciidoc' 'xmlto')
 # perf-libre deps
-makedepends+=('perl' 'python2' 'libnewt' 'elfutils' 'audit' 'libunwind' 'numactl')
+makedepends+=('perl' 'python2' 'libnewt' 'elfutils' 'libunwind' 'numactl')
 # cpupower-libre deps
 makedepends+=('pciutils')
 # usbip-libre deps
@@ -152,7 +152,7 @@ package_libtraceevent-libre() {
 
 package_perf-libre() {
   pkgdesc='Linux kernel performance auditing tool'
-  depends=('perl' 'python2' 'libnewt' 'elfutils' 'audit' 'libunwind' 'binutils'
+  depends=('perl' 'python2' 'libnewt' 'elfutils' 'libunwind' 'binutils'
            'numactl')
   replaces=('perf')  
   conflicts=('perf')
diff --git a/nonprism/amarok-nonprism/PKGBUILD b/nonprism/amarok-nonprism/PKGBUILD
index 03588415a..168b0d5c1 100644
--- a/nonprism/amarok-nonprism/PKGBUILD
+++ b/nonprism/amarok-nonprism/PKGBUILD
@@ -7,7 +7,7 @@
 _pkgname=amarok
 pkgname=amarok-nonprism
 pkgver=2.8.0
-pkgrel=2
+pkgrel=2.1
 pkgdesc="The powerful music player for KDE, without Amazon MP3 store support"
 arch=("i686" "x86_64")
 url="http://amarok.kde.org/"
@@ -25,13 +25,16 @@ optdepends=("libgpod: support for Apple iPod audio devices"
             "ifuse: support for Apple iPod Touch and iPhone"
             "libmygpo-qt: gpodder.net Internet Service")
 install="${_pkgname}.install"
-source=("http://download.kde.org/stable/${_pkgname}/${pkgver}/src/${_pkgname}-${pkgver}.tar.bz2")
-sha1sums=('e76ccd53c05d57f9457d74cd08c2c41383c00937')
+source=("http://download.kde.org/stable/${_pkgname}/${pkgver}/src/${_pkgname}-${pkgver}.tar.bz2"
+        'remove-amazon-references-on-docs.patch')
+sha1sums=('e76ccd53c05d57f9457d74cd08c2c41383c00937'
+          'eed2616fd1465cd16f86f2e3554e3b34b83557af')
 
 prepare() {
   cd ${srcdir}/${_pkgname}-${pkgver}
   sed -i '\|amzdownloader|d' utilities/CMakeLists.txt
   sed -i '\|amazon|d' src/services/CMakeLists.txt
+  patch -Np1 -i ${srcdir}/remove-amazon-references-on-docs.patch
   cd ..
   mkdir build
 }
diff --git a/nonprism/amarok-nonprism/remove-amazon-references-on-docs.patch b/nonprism/amarok-nonprism/remove-amazon-references-on-docs.patch
new file mode 100644
index 000000000..b2b824c4d
--- /dev/null
+++ b/nonprism/amarok-nonprism/remove-amazon-references-on-docs.patch
@@ -0,0 +1,794 @@
+diff --git a/doc/en_US/index.docbook b/doc/en_US/index.docbook
+index 2f60f4d..4608911 100644
+--- a/doc/en_US/index.docbook
++++ b/doc/en_US/index.docbook
+@@ -1199,7 +1199,7 @@
+ <sect1 id="the-media-sources-pane1"><title>The Media Sources pane</title> 
+ <para>The <emphasis>Media Sources</emphasis> pane on the left by default is where you access your local collection as well as other services: <emphasis>Local Music</emphasis> on top, which is the primary interface to your local collection and connected media such as mp3 players and CDs.
+ </para>
+-<para>There is a section for all <emphasis>Internet Services</emphasis> that you have enabled. Here, you can browse listings of radio stations and podcasts; listen and/or subscribe to them, interact with your <ulink url="http://www.last.fm">last.fm</ulink> account, purchase music from online stores such as our new Amazon mp3 store, <ulink url="http://www.magnatune.com/">Magnatune</ulink> and download independent artists' music from <ulink url="http://www.jamendo.com/">Jamendo</ulink> and more.
++<para>There is a section for all <emphasis>Internet Services</emphasis> that you have enabled. Here, you can browse listings of radio stations and podcasts; listen and/or subscribe to them, interact with your <ulink url="http://www.last.fm">last.fm</ulink> account, <ulink url="http://www.magnatune.com/">Magnatune</ulink> and download independent artists' music from <ulink url="http://www.jamendo.com/">Jamendo</ulink> and more.
+ </para>
+ <para>The <emphasis>Playlists</emphasis> section allows you to create and manage <emphasis>Dynamic Playlists</emphasis>, access your <emphasis>Saved Playlists</emphasis> as well as the <emphasis>Automatic Playlist Generator</emphasis>.
+ </para>
+@@ -1495,14 +1495,6 @@
+   </row>
+   <row>
+     <entry>
+-    <para><guilabel>MP3 Music Store</guilabel></para>
+-    </entry>
+-    <entry>
+-    <para>Connects with <guilabel>Amazon MP3 Store</guilabel>, an online music store.</para>
+-    </entry>
+-  </row>
+-  <row>
+-    <entry>
+     <para><guilabel>Podcast Directory</guilabel></para>
+     </entry>
+     <entry>
+@@ -3065,22 +3057,6 @@
+ </para>
+ </sect1>
+ <sect1 id="plugins"><title>Plugins</title> 
+-<para>
+-<screenshot>
+-<screeninfo></screeninfo>
+-  <mediaobject>
+-    <imageobject>
+-      <imagedata fileref="amarok_2-8_configurationdialogplugins.png" format="PNG"/>
+-    </imageobject>
+-    <textobject>
+-      <phrase>Plugins configuration dialog</phrase>
+-    </textobject>
+-    <caption>
+-      <para>Plugins configuration dialog</para>
+-    </caption>
+-  </mediaobject>
+-</screenshot>
+-</para>
+ <para>Plugins configuration controls <guilabel>Collections</guilabel>, <guilabel>Internet Services</guilabel>, and <guilabel>Local Collection Backends</guilabel>.
+ </para>
+ <sect2 id="collections"><title>Collections</title> 
+@@ -3219,17 +3195,6 @@
+   </row>
+   <row>
+     <entry>
+-    <para><guilabel>MP3 Music Store</guilabel></para>
+-    </entry>
+-    <entry>
+-    <para>Access the Amazon MP3 Store directly from Amarok</para>
+-    </entry>
+-    <entry>
+-    <para>Yes</para>
+-    </entry>
+-  </row>
+-  <row>
+-    <entry>
+     <para><guilabel>mp3tunes</guilabel></para>
+     </entry>
+     <entry>
+@@ -3311,21 +3276,6 @@
+ <para>To download, you then go to the <emphasis>Media Sources</emphasis> pane, select the Internet section and click on the Magnatune Store. It will then download the catalog where you can search and select the music you want to buy.
+ </para>
+ </sect2>
+-<sect2 id="mpthree-store-configuration"><title>MP3 Store configuration</title> 
+-<para>Access the Amazon MP3 Store directly from &amarok;.
+-</para>
+-<para>The Amazon MP3 Store needs to know what country you are located in because it offers different items depending on your location. The following countries are allowed:
+-</para>
+-<itemizedlist>
+-<listitem><para>France</para></listitem>
+-<listitem><para>Austria, Germany, Switzerland</para></listitem>
+-<listitem><para>Japan</para></listitem>
+-<listitem><para>United Kingdom</para></listitem>
+-<listitem><para>United States (default)</para></listitem>
+-</itemizedlist>
+-<para>NOTE: Changing the country invalidates your shopping cart. If your country is not in the list, you cannot use the Amazon MP3 Store because it is not supported by Amazon.
+-</para>
+-</sect2>
+ <sect2 id="mp3tunes-configuration"><title>mp3tunes configuration</title> 
+ <para>If you have a personal mp3tunes locker, click <inlinemediaobject> <imageobject> <imagedata fileref="Icon-configure.png" format="PNG"/> </imageobject> </inlinemediaobject> and enter your username and password. You will then be able to access your online locker.
+ </para>
+diff --git a/doc/es/index.docbook b/doc/es/index.docbook
+index dd74364..f2eea97 100644
+--- a/doc/es/index.docbook
++++ b/doc/es/index.docbook
+@@ -2344,7 +2344,7 @@
+ >Servicios de Internet</emphasis
+ > que usted tiene activados. Aquí usted puede navegar por listas de emisoras de radio y podcasts; escucharlas o suscribirse a ellas, interactuar con su cuenta <ulink url="http://www.last.fm"
+ >last.fm</ulink
+->, adquirir música desde tiendas en línea tales como nuestra nueva tienda Amazon, <ulink url="http://www.magnatune.com/"
++>, <ulink url="http://www.magnatune.com/"
+ >Magnatune</ulink
+ > y descargar música de artistas independientes desde <ulink url="http://www.jamendo.com/"
+ >Jamendo</ulink
+@@ -2813,20 +2813,6 @@
+     <entry>
+     <para
+ ><guilabel
+->Tienda de música MP3</guilabel
+-></para>
+-    </entry>
+-    <entry>
+-    <para
+->Conecta con <guilabel
+->Tienda de MP3 Amazon</guilabel
+->, una tienda de música en línea.</para>
+-    </entry>
+-  </row>
+-  <row>
+-    <entry>
+-    <para
+-><guilabel
+ >Directorio de podcast</guilabel
+ ></para>
+     </entry>
+@@ -4981,25 +4967,6 @@
+ ><title
+ >Complementos</title
+ > 
+-<para>
+-<screenshot>
+-<screeninfo
+-></screeninfo>
+-  <mediaobject>
+-    <imageobject>
+-      <imagedata fileref="amarok2-7settingsplugins.png" format="PNG"/>
+-    </imageobject>
+-    <textobject>
+-      <phrase
+-></phrase>
+-    </textobject>
+-    <caption>
+-      <para
+-></para>
+-    </caption>
+-  </mediaobject>
+-</screenshot>
+-</para>
+ <para
+ >La configuración de complementos controla <guilabel
+ >Colecciones</guilabel
+@@ -5223,22 +5190,6 @@
+     <entry>
+     <para
+ ><guilabel
+->Tienda de música MP3</guilabel
+-></para>
+-    </entry>
+-    <entry>
+-    <para
+->Acceder a la tienda MP3 Amazon directamente desde Amarok</para>
+-    </entry>
+-    <entry>
+-    <para
+->Sí</para>
+-    </entry>
+-  </row>
+-  <row>
+-    <entry>
+-    <para
+-><guilabel
+ >mp3tunes</guilabel
+ ></para>
+     </entry>
+@@ -5382,39 +5333,6 @@
+ >Orígenes de medios</emphasis
+ >, seleccionar la sección Internet y pulsar en la tienda Magnatune. Entonces se descargará el catálogo donde usted puede buscar y seleccionar la música que quiere comprar. </para>
+ </sect2>
+-<sect2 id="mpthree-store-configuration"
+-><title
+->Configuración de la tienda MP3</title
+-> 
+-<para
+->Acceder a la tienda MP3 Amazon directamente desde &amarok;. </para>
+-<para
+->La tienda MP3 de Amazon necesita conocer en que país está usted localizado porque ofrece diferentes elementos en función de su ubicación. Se permiten los siguientes países: </para>
+-<itemizedlist>
+-<listitem
+-><para
+->Francia</para
+-></listitem>
+-<listitem
+-><para
+->Austria, Alemania, Suiza</para
+-></listitem>
+-<listitem
+-><para
+->Japón</para
+-></listitem>
+-<listitem
+-><para
+->Reino Unido</para
+-></listitem>
+-<listitem
+-><para
+->Estados Unidos (predeterminado)</para
+-></listitem>
+-</itemizedlist>
+-<para
+->NOTA: Al cambiar el país se invalida su carro de la compra. Si su país no está en la lista, usted no puede usar la tienda MP3 de Amazon porque no está admitido por Amazon. </para>
+-</sect2>
+ <sect2 id="mp3tunes-configuration"
+ ><title
+ >Configuración de mp3tunes</title
+diff --git a/doc/nl/index.docbook b/doc/nl/index.docbook
+index b13f548..ece6784 100644
+--- a/doc/nl/index.docbook
++++ b/doc/nl/index.docbook
+@@ -2302,7 +2302,7 @@
+ >Internet Services</emphasis
+ > die u hebt ingeschakeld. Hier kunnen lijsten met radiostations en podcasts doorgebladerd worden; beluisterd worden en/of zich aanmelden, met het account van <ulink url="http://www.last.fm"
+ >last.fm</ulink
+-> worden gewerkt, muziek worden aangekocht in internetwinkels zoals onze nieuwe Amazon mp3-winkel, <ulink url="http://www.magnatune.com/"
++> worden gewerkt, <ulink url="http://www.magnatune.com/"
+ >Magnatune</ulink
+ > en downloaden van muziek van onafhankelijke artiesten van <ulink url="http://www.jamendo.com/"
+ >Jamendo</ulink
+@@ -2771,20 +2771,6 @@
+     <entry>
+     <para
+ ><guilabel
+->MP3 Music-store</guilabel
+-></para>
+-    </entry>
+-    <entry>
+-    <para
+->Maakt verbinding met <guilabel
+->Amazon MP3 winkel</guilabel
+->, een geweldige online muziekwinkel.</para>
+-    </entry>
+-  </row>
+-  <row>
+-    <entry>
+-    <para
+-><guilabel
+ >Podcastmap</guilabel
+ ></para>
+     </entry>
+@@ -5181,22 +5167,6 @@
+     <entry>
+     <para
+ ><guilabel
+->MP3 Music-store</guilabel
+-></para>
+-    </entry>
+-    <entry>
+-    <para
+->De Amazon MP3-store direct vanuit Amarok benaderen</para>
+-    </entry>
+-    <entry>
+-    <para
+->Ja</para>
+-    </entry>
+-  </row>
+-  <row>
+-    <entry>
+-    <para
+-><guilabel
+ >mp3tunes</guilabel
+ ></para>
+     </entry>
+@@ -5340,39 +5310,6 @@
+ >Mediabronnen</emphasis
+ > gaan, de internetsectie selecteren en op de Magnatune-winkel klikken. De catalogus wordt gedownload zodat de muziek die u wilt kopen opgezocht en geselecteerd kan worden. </para>
+ </sect2>
+-<sect2 id="mpthree-store-configuration"
+-><title
+->Instellingen van MP3 winkel</title
+-> 
+-<para
+->De Amazon MP3 winkel direct vanuit &amarok; benaderen </para>
+-<para
+->De MP3-winkel van Amazon moet weten in welk land u verblijft omdat het afhankelijk van de locatie andere items aanbiedt. De volgende landen zijn toegestaan: </para>
+-<itemizedlist>
+-<listitem
+-><para
+->Frankrijk</para
+-></listitem>
+-<listitem
+-><para
+->Oostenrijk, Duitsland, Zwitserland</para
+-></listitem>
+-<listitem
+-><para
+->Japan</para
+-></listitem>
+-<listitem
+-><para
+->Verenigd Koninkrijk</para
+-></listitem>
+-<listitem
+-><para
+->Verenigde Staten (standaard)</para
+-></listitem>
+-</itemizedlist>
+-<para
+->LET OP: het wijzigen van het land maakt het winkelmandje ongeldig. In landen die niet voorkomen in de lijst kunt u de MP3-winkel van Amazon niet gebruiken. </para>
+-</sect2>
+ <sect2 id="mp3tunes-configuration"
+ ><title
+ >Configuratie van mp3tunes</title
+@@ -7258,25 +7195,6 @@
+ >Plug-ins</guimenuitem
+ ></menuchoice
+ >. </para>
+-<para>
+-<screenshot>
+-<screeninfo
+-></screeninfo>
+-  <mediaobject>
+-    <imageobject>
+-      <imagedata fileref="amarok2-6pluginsconfigmenu.png" format="PNG"/>
+-    </imageobject>
+-    <textobject>
+-      <phrase
+->klik op het pictogram Gereedschap om het instellingenvenster te openen</phrase>
+-    </textobject>
+-    <caption>
+-      <para
+->klik op het pictogram Gereedschap om het instellingenvenster te openen</para>
+-    </caption>
+-  </mediaobject>
+-</screenshot>
+-</para>
+ <para
+ ><guilabel
+ >Server toevoegen</guilabel
+diff --git a/doc/pt/index.docbook b/doc/pt/index.docbook
+index 04454b0..eeed950 100644
+--- a/doc/pt/index.docbook
++++ b/doc/pt/index.docbook
+@@ -2789,20 +2789,6 @@
+     <entry>
+     <para
+ ><guilabel
+->Loja de Músicas MP3</guilabel
+-></para>
+-    </entry>
+-    <entry>
+-    <para
+->Connects with <guilabel
+->Amazon MP3 Store</guilabel
+-> an online music store.</para>
+-    </entry>
+-  </row>
+-  <row>
+-    <entry>
+-    <para
+-><guilabel
+ >Pasta de 'Podcasts'</guilabel
+ ></para>
+     </entry>
+@@ -5281,22 +5267,6 @@
+     <entry>
+     <para
+ ><guilabel
+->Loja de Músicas MP3</guilabel
+-></para>
+-    </entry>
+-    <entry>
+-    <para
+->Aceder à loja de MP da Amazon directamente do Amarok</para>
+-    </entry>
+-    <entry>
+-    <para
+->Sim</para>
+-    </entry>
+-  </row>
+-  <row>
+-    <entry>
+-    <para
+-><guilabel
+ >Pasta de 'Podcasts'</guilabel
+ ></para>
+     </entry>
+@@ -5374,39 +5344,6 @@
+ >Fontes Multimédia</emphasis
+ >, seleccione a secção da Internet e carregue na Loja Magnatune. Irá então transferir o catálogo, para que possa procurar e seleccionar a música que deseja comprar. </para>
+ </sect2>
+-<sect2 id="mp3-store-configuration"
+-><title
+->Configuração da Loja de MP3</title
+-> 
+-<para
+->Acede directamente à Loja de MP3 da Amazon directamente a partir do &amarok;. </para>
+-<para
+->A Loja de MP3 da Amazon necessita de saber em que país você se localiza, dado que apresenta diferentes itens de acordo com a sua localização. São permitidos os seguintes países: </para>
+-<itemizedlist>
+-<listitem
+-><para
+->França</para
+-></listitem>
+-<listitem
+-><para
+->Áustria, Alemanha, Suíça</para
+-></listitem>
+-<listitem
+-><para
+->Japão</para
+-></listitem>
+-<listitem
+-><para
+->Reino Unido</para
+-></listitem>
+-<listitem
+-><para
+->Estados Unidos (por omissão)</para
+-></listitem>
+-</itemizedlist>
+-<para
+->NOTA: Se modificar o país, irá invalidar o seu carrinho de compras. Se o seu país não estiver na lista, não poderá usar a Loja de MP3 da Amazon, dado não ser suportada pela Amazon. </para>
+-</sect2>
+ </sect1>
+ <sect1 id="scripts"
+ ><title
+diff --git a/doc/pt_BR/index.docbook b/doc/pt_BR/index.docbook
+index a9199f4..32e735b 100644
+--- a/doc/pt_BR/index.docbook
++++ b/doc/pt_BR/index.docbook
+@@ -2324,7 +2324,7 @@
+ >Serviços Internet</emphasis
+ > que você tiver ativado. Aqui você pode navegar por listas de estações de rádio e podcasts; ouvir e/ou inscrever-se a eles, interagir com sua conta do <ulink url="http://www.last.fm"
+ >last.fm</ulink
+->, comprar músicas de lojas on-line, como a nova loja Amazon MP3 ou a <ulink url="http://www.magnatune.com/"
++>, comprar músicas de lojas on-line ou a <ulink url="http://www.magnatune.com/"
+ >Magnatune</ulink
+ > e baixar músicas de artistas independentes a partir da <ulink url="http://www.jamendo.com/"
+ >Jamendo</ulink
+@@ -2793,20 +2793,6 @@
+     <entry>
+     <para
+ ><guilabel
+->MP3 Music Store</guilabel
+-></para>
+-    </entry>
+-    <entry>
+-    <para
+->Conecta com a <guilabel
+->Loja Amazon MP3</guilabel
+->, uma grande loja de músicas online.</para>
+-    </entry>
+-  </row>
+-  <row>
+-    <entry>
+-    <para
+-><guilabel
+ >Pasta de Podcast</guilabel
+ ></para>
+     </entry>
+@@ -4961,25 +4947,6 @@
+ ><title
+ >Plugins</title
+ > 
+-<para>
+-<screenshot>
+-<screeninfo
+-></screeninfo>
+-  <mediaobject>
+-    <imageobject>
+-      <imagedata fileref="amarok2-7settingsplugins.png" format="PNG"/>
+-    </imageobject>
+-    <textobject>
+-      <phrase
+-></phrase>
+-    </textobject>
+-    <caption>
+-      <para
+-></para>
+-    </caption>
+-  </mediaobject>
+-</screenshot>
+-</para>
+ <para
+ >A configuração dos plugins controla as <guilabel
+ >Coleções</guilabel
+@@ -5203,22 +5170,6 @@
+     <entry>
+     <para
+ ><guilabel
+->MP3 Music Store</guilabel
+-></para>
+-    </entry>
+-    <entry>
+-    <para
+->Acessa a loja Amazon MP3 diretamente do Amarok</para>
+-    </entry>
+-    <entry>
+-    <para
+->Sim</para>
+-    </entry>
+-  </row>
+-  <row>
+-    <entry>
+-    <para
+-><guilabel
+ >MP3tunes</guilabel
+ ></para>
+     </entry>
+@@ -5362,39 +5313,6 @@
+ >Fontes multimídia</emphasis
+ >, selecione a seção Internet e clique na loja Magnatune. Irá então baixar o catálogo, para que você possa procurar e selecionar a música que deseja comprar. </para>
+ </sect2>
+-<sect2 id="mpthree-store-configuration"
+-><title
+->Configuração da loja de MP3</title
+-> 
+-<para
+->Acessa a loja Amazon MP3 diretamente do &amarok;. </para>
+-<para
+->A loja Amazon MP3 precisa saber o país em que você está, pois ela oferece diferentes itens de acordo com a sua localização. São permitidos os seguintes países: </para>
+-<itemizedlist>
+-<listitem
+-><para
+->França</para
+-></listitem>
+-<listitem
+-><para
+->Áustria, Alemanha, Suíça</para
+-></listitem>
+-<listitem
+-><para
+->Japão</para
+-></listitem>
+-<listitem
+-><para
+->Reino Unido</para
+-></listitem>
+-<listitem
+-><para
+->Estados Unidos (padrão)</para
+-></listitem>
+-</itemizedlist>
+-<para
+->NOTA: Se modificar o país irá invalidar o seu carrinho de compras. Se o seu país não estiver na lista, você não poderá usar a loja Amazon MP3 porque não há suporte. </para>
+-</sect2>
+ <sect2 id="mp3tunes-configuration"
+ ><title
+ >Configuração do mp3tunes</title
+diff --git a/doc/sv/index.docbook b/doc/sv/index.docbook
+index 010b760..4b1a81e 100644
+--- a/doc/sv/index.docbook
++++ b/doc/sv/index.docbook
+@@ -2312,7 +2312,7 @@
+ >Internettjänster</emphasis
+ > som du har aktiverat. Här kan du bläddra bland listor över radiostationer och podsändningar, lyssna på eller prenumerera på dem, interagera med ditt konto på <ulink url="http://www.last.fm"
+ >last.fm</ulink
+->, köpa musik från Internetbutiker som vår nya Amazon MP3-butik, <ulink url="http://www.magnatune.com/"
++>, <ulink url="http://www.magnatune.com/"
+ >Magnatune</ulink
+ > och ladda ner oberoende artisters musik från <ulink url="http://www.jamendo.com/"
+ >Jamendo</ulink
+@@ -2781,20 +2781,6 @@
+     <entry>
+     <para
+ ><guilabel
+->MP3-musikbutik</guilabel
+-></para>
+-    </entry>
+-    <entry>
+-    <para
+->Ansluter till <guilabel
+->Amazons MP3-butik</guilabel
+->, en musikaffär på Internet.</para>
+-    </entry>
+-  </row>
+-  <row>
+-    <entry>
+-    <para
+-><guilabel
+ >Podsändningskatalog</guilabel
+ ></para>
+     </entry>
+@@ -4947,25 +4933,6 @@
+ ><title
+ >Insticksprogram</title
+ > 
+-<para>
+-<screenshot>
+-<screeninfo
+-></screeninfo>
+-  <mediaobject>
+-    <imageobject>
+-      <imagedata fileref="amarok2-7settingsplugins.png" format="PNG"/>
+-    </imageobject>
+-    <textobject>
+-      <phrase
+-></phrase>
+-    </textobject>
+-    <caption>
+-      <para
+-></para>
+-    </caption>
+-  </mediaobject>
+-</screenshot>
+-</para>
+ <para
+ >Anpassning av insticksprogram styr nu <guilabel
+ >Samlingar</guilabel
+@@ -5189,22 +5156,6 @@
+     <entry>
+     <para
+ ><guilabel
+->MP3-musikbutik</guilabel
+-></para>
+-    </entry>
+-    <entry>
+-    <para
+->Kom åt Amazons MP3-butik direkt från Amarok</para>
+-    </entry>
+-    <entry>
+-    <para
+->Ja</para>
+-    </entry>
+-  </row>
+-  <row>
+-    <entry>
+-    <para
+-><guilabel
+ >mp3tunes</guilabel
+ ></para>
+     </entry>
+@@ -5348,39 +5299,6 @@
+ >Mediakällor</emphasis
+ >, väljer Internetavdelningen, och klickar på Magnatunes butik. Det kommer då ladda ner katalogen där du kan söka och välja musiken du vill köpa. </para>
+ </sect2>
+-<sect2 id="mpthree-store-configuration"
+-><title
+->Inställning av MP3-butik</title
+-> 
+-<para
+->Kom åt Amazons MP3-butik direkt från &amarok;. </para>
+-<para
+->Amazons MP3-butik måste veta vilket land du finns i, eftersom den erbjuder olika varor beroende på var du bor. Följande länder är tillåtna: </para>
+-<itemizedlist>
+-<listitem
+-><para
+->Frankrike</para
+-></listitem>
+-<listitem
+-><para
+->Österrike, Tyskland, Schweiz</para
+-></listitem>
+-<listitem
+-><para
+->Japan</para
+-></listitem>
+-<listitem
+-><para
+->Storbritannien</para
+-></listitem>
+-<listitem
+-><para
+->Förenta staterna (förval)</para
+-></listitem>
+-</itemizedlist>
+-<para
+->Observera: Att ändra land gör att kundvagnen inte gäller längre. Om landet du bor i inte finns i listan kan du inte använda Amazons MP3-butik eftersom det inte stöds av Amazon. </para>
+-</sect2>
+ <sect2 id="mp3tunes-configuration"
+ ><title
+ >Inställning av mp3tunes</title
+diff --git a/doc/uk/index.docbook b/doc/uk/index.docbook
+index 815205c..b2b45d4 100644
+--- a/doc/uk/index.docbook
++++ b/doc/uk/index.docbook
+@@ -2288,7 +2288,7 @@
+ >Інтернет-служб</emphasis
+ >. За допомогою цього розділу ви можете переглядати списки радіостанцій та трансляцій (подкастів); прослуховувати і/або підписуватися на них, працювати з вашим обліковим записом <ulink url="http://www.last.fm"
+ >last.fm</ulink
+->, купувати музику у мережевих магазинах, зокрема нашої нової крамниці MP3 у Amazon, <ulink url="http://www.magnatune.com/"
++>, купувати музику у мережевих магазинах, <ulink url="http://www.magnatune.com/"
+ >Magnatune</ulink
+ > і отримувати музику від незалежних виконавців з <ulink url="http://www.jamendo.com/"
+ >Jamendo</ulink
+@@ -2759,20 +2759,6 @@
+     <entry>
+     <para
+ ><guilabel
+->Музична крамниця з продажу MP3</guilabel
+-></para>
+-    </entry>
+-    <entry>
+-    <para
+->З’єднує ваш комп’ютер з <guilabel
+->Amazon MP3 Store</guilabel
+->, музичною крамницею у інтернеті.</para>
+-    </entry>
+-  </row>
+-  <row>
+-    <entry>
+-    <para
+-><guilabel
+ >Каталог трансляцій</guilabel
+ ></para>
+     </entry>
+@@ -5138,25 +5124,6 @@
+ ><title
+ >Додатки</title
+ > 
+-<para>
+-<screenshot>
+-<screeninfo
+-></screeninfo>
+-  <mediaobject>
+-    <imageobject>
+-      <imagedata fileref="amarok_2-8_configurationdialogplugins.png" format="PNG"/>
+-    </imageobject>
+-    <textobject>
+-      <phrase
+->Діалогове вікно налаштовування додатків</phrase>
+-    </textobject>
+-    <caption>
+-      <para
+->Діалогове вікно налаштовування додатків</para>
+-    </caption>
+-  </mediaobject>
+-</screenshot>
+-</para>
+ <para
+ >За допомогою налаштування додатків можна керувати <guilabel
+ >Збірками</guilabel
+@@ -5381,22 +5348,6 @@
+     <entry>
+     <para
+ ><guilabel
+->Музична крамниця з продажу MP3</guilabel
+-></para>
+-    </entry>
+-    <entry>
+-    <para
+->Доступ до крамниці з продажу MP3 Amazon безпосередньо з Amarok</para>
+-    </entry>
+-    <entry>
+-    <para
+->Так</para>
+-    </entry>
+-  </row>
+-  <row>
+-    <entry>
+-    <para
+-><guilabel
+ >mp3tunes</guilabel
+ ></para>
+     </entry>
+@@ -5540,39 +5491,6 @@
+ >Джерела даних</emphasis
+ >, виберіть розділ «Інтернет» і натисніть пункт крамниці Magnatune. Програма виконає звантаження каталогу, у якому ви зможете знайти і вибрати музичні твори, записи яких ви хотіли б придбати. </para>
+ </sect2>
+-<sect2 id="mpthree-store-configuration"
+-><title
+->Налаштовування доступу до крамниці MP3</title
+-> 
+-<para
+->Доступ до крамниці з продажу MP3 Amazon безпосередньо з &amarok;. </para>
+-<para
+->Для користування музичною крамницею MP3 Amazon програмі потрібно знати, у якій країні ви користуєтеся цією крамницею, оскільки список пропозицій залежатиме від вашого розташування. Передбачено роботу у таких країнах: </para>
+-<itemizedlist>
+-<listitem
+-><para
+->Франція</para
+-></listitem>
+-<listitem
+-><para
+->Австрія, Німеччина, Швейцарія</para
+-></listitem>
+-<listitem
+-><para
+->Японія</para
+-></listitem>
+-<listitem
+-><para
+->Великобританія</para
+-></listitem>
+-<listitem
+-><para
+->США (типова країна)</para
+-></listitem>
+-</itemizedlist>
+-<para
+->Зауваження: після зміни країни втрачає чинність кошик з придбаннями. Якщо вашої країни немає у списку, ви не зможете скористатися музичною крамницею MP3 Amazon, оскільки таке користування не передбачено правилами Amazon. </para>
+-</sect2>
+ <sect2 id="mp3tunes-configuration"
+ ><title
+ >Налаштовування mp3tunes</title
diff --git a/nonprism/gnome-online-accounts-nonprism/PKGBUILD b/nonprism/gnome-online-accounts-nonprism/PKGBUILD
index 26a7ce395..e47cd4c98 100644
--- a/nonprism/gnome-online-accounts-nonprism/PKGBUILD
+++ b/nonprism/gnome-online-accounts-nonprism/PKGBUILD
@@ -1,24 +1,24 @@
-# $Id: PKGBUILD 208734 2014-03-25 23:34:47Z jgc $
+# $Id: PKGBUILD 211221 2014-04-18 11:14:01Z heftig $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 # Maintainer (Parabola): Márcio Silva <coadde@parabola.nu>
 
 _pkgname=gnome-online-accounts
 pkgname=gnome-online-accounts-nonprism
-pkgver=3.12.0
+pkgver=3.12.1
 pkgrel=1
 pkgdesc="GNOME service to access online accounts, without support for unsafe and dangerous for privacy protocols"
 arch=(i686 x86_64 mips64el)
 url="http://www.gnome.org"
 license=('GPL')
-depends=('webkitgtk' 'json-glib' 'libnotify' 'rest' 'hicolor-icon-theme' 'libsecret'
-         'telepathy-glib' 'krb5' 'gcr')
-makedepends=('intltool' 'libxslt' 'gobject-introspection' 'docbook-xsl')
 provides=("$_pkgname=$pkgver")
 conflicts=$_pkgname
 replaces=($_pkgname $pkgname-coherence)
+depends=('webkitgtk' 'json-glib' 'libnotify' 'rest' 'hicolor-icon-theme' 'libsecret'
+         'telepathy-glib' 'krb5' 'gcr')
+makedepends=('intltool' 'libxslt' 'gobject-introspection' 'docbook-xsl')
 install=$_pkgname.install
 source=(http://ftp.gnome.org/pub/gnome/sources/$_pkgname/${pkgver:0:4}/$_pkgname-$pkgver.tar.xz)
-sha256sums=('81d44afb3b993b7fb465d19b1b572db423bc7591e309f829d0639c802d7dfcc2')
+sha256sums=('2b8930e463c84d609a00ed9337db16550de89e7a7b8184ab18f2a63f150e7cef')
 
 build() {
   cd $_pkgname-$pkgver
diff --git a/nonprism/kipi-plugins-libre-nonprism/PKGBUILD b/nonprism/kipi-plugins-libre-nonprism/PKGBUILD
new file mode 100644
index 000000000..eb1c06b9c
--- /dev/null
+++ b/nonprism/kipi-plugins-libre-nonprism/PKGBUILD
@@ -0,0 +1,79 @@
+# $Id: PKGBUILD 211141 2014-04-17 06:54:31Z andrea $
+# Maintainer: Ronald van Haren <ronald@archlinux.org>
+# Contributor: Andrea Scarpino <andrea@archlinux.org>
+# Contributor: Tobias Powalowski <tpowa@archlinux.org>
+# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
+# Contributor (Parabola): Márcio Silva <coadde@parabola.nu>
+
+pkgbase=digikam
+_pkgname=kipi-plugins
+pkgname=kipi-plugins-libre-nonprism
+pkgver=3.5.0
+pkgrel=4
+pkgdesc="A collection of plugins extending the KDE graphics and image applications as digiKam, without nonfree jAlbum and SimpleViewer support and support for unsafe and dangerous for privacy protocols"
+arch=('i686' 'x86_64' 'mips64el')
+license=('GPL')
+url="http://www.digikam.org/"
+replaces=$_pkgname
+conflicts=$_pkgname
+provides=$_pkgname=$pkgver
+makedepends=('kdepimlibs' 'libkexiv2' 'libkdcraw' 'libkipi' 'libksane' 'liblqr'
+             'kdeedu-marble' 'opencv' 'boost' 'libgpod' 'qjson' 'hugin' 'libgphoto2'
+             'cmake' 'automoc4' 'doxygen' 'lensfun' 'qt-gstreamer' 'imagemagick' 'eigen')
+depends=('kdebase-runtime' 'kdepimlibs' 'libkdcraw' 'libkipi' 'libksane' 'libkexiv2')
+optdepends=('libkgeomap: Geolocalize tool'
+            'libmediawiki: MediaWiki Export plugin'
+            'libgpod: iPodExport plugin'
+            'opencv: Remove Red Eyes plugin'
+            'imagemagick: Video SlideShow plugin'
+            'qt-gstreamer: Video SlideShow plugin')
+options=('staticlibs')
+install=kipi-plugins.install
+source=("http://download.kde.org/stable/${pkgbase}/${pkgbase}-${pkgver}.tar.bz2")
+sha1sums=('9e44fcf219312cbcbbaee0cc9a7f460a01769224')
+
+prepare() {
+  cd ${srcdir}/${pkgbase}-${pkgver}
+  sed -i '\|flashexport|d
+          \|jalbumexport|d
+          \|imageshackexport|d
+          s| Facebook, and Imgur||
+          \|QtKOAuth|d
+          \|Imgur|d
+          \|imgurexport|d
+          \|LIBKVKONTAKTE|d
+          \|vkontakte|d
+          s| and YandexFotki||
+          \|YandexFotki|d
+          \|yandexfotki|d
+          \|DlnaExport|d
+          \|dlnaexport|d
+          \|Facebook|d
+          \|facebook|d
+          \|flickrexport|d
+          \|picasawebexport|d
+         ' extra/kipi-plugins/CMakeLists.txt
+  sed -i '\|m_actionExport| s|true|false|
+         ' extra/kipi-plugins/smug/plugin_smug.cpp
+  sed -i '\|Remote Flickr Export plugin|,+2 d
+          \|flickrexport|d
+         ' doc/kipi-plugins/index.docbook
+  cd ..
+  mkdir build
+}
+
+build() {
+  cd build
+  cmake ../${pkgbase}-${pkgver} \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DCMAKE_SKIP_RPATH=ON \
+    -DBUILD_tests=OFF \
+    -DDIGIKAMSC_USE_PRIVATE_KDEGRAPHICS=OFF
+  make
+}
+
+package() {
+  cd build/extra/kipi-plugins
+  make DESTDIR="${pkgdir}" install
+}
diff --git a/nonprism/kipi-plugins-libre-nonprism/kipi-plugins.install b/nonprism/kipi-plugins-libre-nonprism/kipi-plugins.install
new file mode 100644
index 000000000..81ce5c4b0
--- /dev/null
+++ b/nonprism/kipi-plugins-libre-nonprism/kipi-plugins.install
@@ -0,0 +1,12 @@
+post_install() {
+	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+    update-desktop-database -q
+}
+
+post_upgrade() {
+	post_install
+}
+
+post_remove() {
+	post_install
+}