Sun Feb 9 03:15:59 UTC 2014

13 files changed, 411 insertions, 188 deletions

diff --git a/community/duplicity/PKGBUILD b/community/duplicity/PKGBUILD
index b26a94b8b..76777625f 100644
--- a/community/duplicity/PKGBUILD
+++ b/community/duplicity/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 105117 2014-01-31 20:58:55Z lfleischer $
+# $Id: PKGBUILD 105459 2014-02-08 15:39:11Z bgyorgy $
 # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de>
 # Contributor: Kaiting Chen <kaitocracy@gmail.com>
 # Contributor: Aaron Schaefer <aaron@elasticdog.com>
 
 pkgname=duplicity
 pkgver=0.6.23
-pkgrel=2
+pkgrel=3
 pkgdesc='A utility for encrypted, bandwidth-efficient backups using the rsync algorithm.'
 arch=('i686' 'x86_64')
 url='http://www.nongnu.org/duplicity/'
@@ -19,9 +19,18 @@ optdepends=('lftp: FTPS backend'
             'python2-httplib2: Ubuntu One backend'
             'python2-oauthlib: Ubuntu One backend'
             'rsync: rsync backend')
-source=("http://savannah.nongnu.org/download/$pkgname/$pkgname-$pkgver.tar.gz"{,.sig})
+source=("http://savannah.nongnu.org/download/$pkgname/$pkgname-$pkgver.tar.gz"{,.sig}
+        "gpg-encode.patch")
 md5sums=('ae0e84446bcf114735de1057ed53c977'
-         'SKIP')
+         'SKIP'
+         '366555c73aeebf7f15f6f37ec65176ce')
+
+prepare() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+
+  # Fix gpg encrypted backup (FS#38838, upstream revision 961, will be fixed in 0.6.24).
+  patch -Np0 -i ../gpg-encode.patch
+}
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/community/duplicity/gpg-encode.patch b/community/duplicity/gpg-encode.patch
new file mode 100644
index 000000000..f9159a3ca
--- /dev/null
+++ b/community/duplicity/gpg-encode.patch
@@ -0,0 +1,216 @@
+=== modified file 'bin/duplicity'
+--- bin/duplicity	2014-01-21 21:04:27 +0000
++++ bin/duplicity	2014-02-05 02:57:13 +0000
+@@ -27,7 +27,7 @@
+ # Please send mail to me or the mailing list if you find bugs or have
+ # any suggestions.
+ 
+-import getpass, gzip, os, sys, time, types
++import gzip, os, sys, time, types
+ import traceback, platform, statvfs, resource, re
+ import threading
+ from datetime import datetime
+@@ -37,9 +37,6 @@
+ if os.path.exists(os.path.join(pwd, "../duplicity")):
+     sys.path.insert(0, os.path.abspath(os.path.join(pwd, "../.")))
+ 
+-import gettext
+-gettext.install('duplicity', codeset='utf8')
+-
+ from duplicity import log
+ log.setup()
+ 
+@@ -65,6 +62,13 @@
+ # If exit_val is not None, exit with given value at end.
+ exit_val = None
+ 
++def getpass_safe(message):
++    # getpass() in Python 2.x will call str() on our prompt.  So we can't pass
++    # in non-ascii characters.
++    import getpass, locale
++    message = message.encode(locale.getpreferredencoding(), 'replace')
++    return getpass.getpass(message)
++
+ def get_passphrase(n, action, for_signing = False):
+     """
+     Check to make sure passphrase is indeed needed, then get
+@@ -160,19 +164,19 @@
+                     if use_cache and globals.gpg_profile.signing_passphrase:
+                         pass1 = globals.gpg_profile.signing_passphrase
+                     else:
+-                        pass1 = getpass.getpass(_("GnuPG passphrase for signing key:")+" ")
++                        pass1 = getpass_safe(_("GnuPG passphrase for signing key:")+" ")
+                 else:
+                     if use_cache and globals.gpg_profile.passphrase:
+                         pass1 = globals.gpg_profile.passphrase
+                     else:
+-                        pass1 = getpass.getpass(_("GnuPG passphrase:")+" ")
++                        pass1 = getpass_safe(_("GnuPG passphrase:")+" ")
+ 
+             if n == 1:
+                 pass2 = pass1
+             elif for_signing:
+-                pass2 = getpass.getpass(_("Retype passphrase for signing key to confirm: "))
++                pass2 = getpass_safe(_("Retype passphrase for signing key to confirm: "))
+             else:
+-                pass2 = getpass.getpass(_("Retype passphrase to confirm: "))
++                pass2 = getpass_safe(_("Retype passphrase to confirm: "))
+ 
+             if not pass1 == pass2:
+                 print _("First and second passphrases do not match!  Please try again.")
+
+=== modified file 'bin/rdiffdir'
+--- bin/rdiffdir	2013-12-27 06:39:00 +0000
++++ bin/rdiffdir	2014-02-05 02:57:13 +0000
+@@ -27,9 +27,6 @@
+ 
+ import sys, getopt, gzip, os
+ 
+-import gettext
+-gettext.install('duplicity', codeset='utf8')
+-
+ from duplicity import diffdir
+ from duplicity import patchdir
+ from duplicity import log
+
+=== added directory 'testing/overrides'
+=== added file 'testing/overrides/gettext.py'
+--- testing/overrides/gettext.py	1970-01-01 00:00:00 +0000
++++ testing/overrides/gettext.py	2014-02-05 02:57:13 +0000
+@@ -0,0 +1,34 @@
++# -*- Mode:Python; indent-tabs-mode:nil; tab-width:4; encoding:utf8 -*-
++#
++# Copyright 2014 Michael Terry <mike@mterry.name>
++#
++# This file is part of duplicity.
++#
++# Duplicity is free software; you can redistribute it and/or modify it
++# under the terms of the GNU General Public License as published by the
++# Free Software Foundation; either version 2 of the License, or (at your
++# option) any later version.
++#
++# Duplicity is distributed in the hope that it will be useful, but
++# WITHOUT ANY WARRANTY; without even the implied warranty of
++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++# General Public License for more details.
++#
++# You should have received a copy of the GNU General Public License
++# along with duplicity; if not, write to the Free Software Foundation,
++# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
++
++# This is just a small override to the system gettext.py which allows us to
++# always return a string with fancy unicode characters, which will notify us
++# if we ever get a unicode->ascii translation by accident.
++
++def translation(*args, **kwargs):
++    class Translation:
++        ZWSP = u"​" # ZERO WIDTH SPACE, basically an invisible space separator
++        def install(self, **kwargs):
++            import __builtin__
++            __builtin__.__dict__['_'] = lambda x: x + self.ZWSP
++        def ungettext(self, one, more, n):
++            if n == 1: return one + self.ZWSP
++            else:      return more + self.ZWSP
++    return Translation()
+
+=== modified file 'testing/run-tests'
+--- testing/run-tests	2011-11-24 01:49:53 +0000
++++ testing/run-tests	2014-02-05 02:57:13 +0000
+@@ -25,9 +25,9 @@
+ 
+ THISDIR=$(pwd)
+ export TZ=US/Central
+-export LANG=
++export LANG=en_US.UTF-8
+ # up for 'duplicity' module and here for 'helper.py'
+-export PYTHONPATH="$(dirname $THISDIR):$THISDIR/helpers"
++export PYTHONPATH="$THISDIR/overrides:$(dirname $THISDIR):$THISDIR/helpers"
+ export GNUPGHOME="$THISDIR/gnupg"
+ export PATH="$(dirname $THISDIR)/bin:$PATH"
+ 
+
+=== modified file 'testing/tests/finaltest.py'
+--- testing/tests/finaltest.py	2012-11-24 19:45:09 +0000
++++ testing/tests/finaltest.py	2014-02-05 02:57:13 +0000
+@@ -20,6 +20,7 @@
+ # Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ 
+ import helper
++import pexpect
+ import sys, os, unittest
+ 
+ import duplicity.backend
+@@ -50,7 +51,8 @@
+     """
+     Test backup/restore using duplicity binary
+     """
+-    def run_duplicity(self, arglist, options = [], current_time = None):
++    def run_duplicity(self, arglist, options = [], current_time = None,
++                      passphrase_input = None):
+         """Run duplicity binary with given arguments and options"""
+         options.append("--archive-dir testfiles/cache")
+         cmd_list = ["duplicity"]
+@@ -62,22 +64,23 @@
+         cmd_list.extend(arglist)
+         cmdline = " ".join(cmd_list)
+         #print "Running '%s'." % cmdline
+-        if not os.environ.has_key('PASSPHRASE'):
++        if passphrase_input is None and not os.environ.has_key('PASSPHRASE'):
+             os.environ['PASSPHRASE'] = 'foobar'
+-        return_val = os.system(cmdline)
++        (output, return_val) = pexpect.run(cmdline, withexitstatus=True,
++            events={'passphrase.*:': passphrase_input}) 
+         if return_val:
+             raise CmdError(return_val)
+ 
+-    def backup(self, type, input_dir, options = [], current_time = None):
++    def backup(self, type, input_dir, options = [], **kwargs):
+         """Run duplicity backup to default directory"""
+         options = options[:]
+         if type == "full":
+             options.insert(0, 'full')
+         args = [input_dir, "'%s'" % backend_url]
+-        self.run_duplicity(args, options, current_time)
++        self.run_duplicity(args, options, **kwargs)
+ 
+     def restore(self, file_to_restore = None, time = None, options = [],
+-                current_time = None):
++                **kwargs):
+         options = options[:] # just nip any mutability problems in bud
+         assert not os.system("rm -rf testfiles/restore_out")
+         args = ["'%s'" % backend_url, "testfiles/restore_out"]
+@@ -85,17 +88,17 @@
+             options.extend(['--file-to-restore', file_to_restore])
+         if time:
+             options.extend(['--restore-time', str(time)])
+-        self.run_duplicity(args, options, current_time)
++        self.run_duplicity(args, options, **kwargs)
+ 
+     def verify(self, dirname, file_to_verify = None, time = None, options = [],
+-               current_time = None):
++               **kwargs):
+         options = ["verify"] + options[:]
+         args = ["'%s'" % backend_url, dirname]
+         if file_to_verify:
+             options.extend(['--file-to-restore', file_to_verify])
+         if time:
+             options.extend(['--restore-time', str(time)])
+-        self.run_duplicity(args, options, current_time)
++        self.run_duplicity(args, options, **kwargs)
+ 
+     def deltmp(self):
+         """Delete temporary directories"""
+@@ -255,6 +258,12 @@
+         assert chain.start_time == 30000, chain.start_time
+         assert chain.end_time == 40000, chain.end_time
+ 
++    def test_piped_password(self):
++        """Make sure that prompting for a password works"""
++        self.backup("full", "testfiles/empty_dir",
++                    passphrase_input="foobar\nfoobar\n")
++        self.restore(passphrase_input="foobar\n")
++
+ class FinalTest1(FinalTest, unittest.TestCase):
+     def setUp(self):
+         assert not os.system("tar xzf testfiles.tar.gz > /dev/null 2>&1")
+
diff --git a/community/erlang-nox/PKGBUILD b/community/erlang-nox/PKGBUILD
index c90038f3c..aeef7e0ff 100644
--- a/community/erlang-nox/PKGBUILD
+++ b/community/erlang-nox/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 102627 2013-12-16 21:55:26Z arodseth $
+# $Id: PKGBUILD 105465 2014-02-08 18:44:33Z arodseth $
 # Maintainer: Alexander Rødseth <rodseth@gmail.com>
 # Contributor: Lukas Fleischer <archlinux@cryptocrack.de>
 # Contributor: Vesa Kaihlavirta <vesa@archlinux.org>
@@ -7,8 +7,8 @@
 # Contributor: Ricardo Catalinas Jiménez <jimenezrick@gmail.com>
 
 pkgname=erlang-nox
-pkgver=R16B03
-pkgrel=2
+pkgver=R16B03_1
+pkgrel=1
 pkgdesc='General-purpose concurrent functional programming language developed by Ericsson (headless version)'
 arch=('x86_64' 'i686')
 url='http://www.erlang.org/'
@@ -25,27 +25,27 @@ source=("http://www.erlang.org/download/otp_src_${pkgver/_/-}.tar.gz"
         'epmd.service'
         'epmd.socket'
         'epmd.conf')
-sha256sums=('6133b3410681a5c934e54c76eee1825f96dead8d6a12c31a64f6e160daf0bb06'
-            'a2038d32e7c940d5d04f7338406e11b723cac0d26e82d7834596105eea492452'
+sha256sums=('17ce53459bc5ceb34fc2da412e15ac8c23835a15fbd84e62c8d1852704747ee7'
+            '0f31bc7d7215aa4b6834b1a565cd7d6e3173e3b392fb870254bae5136499c39d'
             'b121ec9053fb37abca5f910a81c526f93ec30fe13b574a12209223b346886a9e'
             '998a759e4cea4527f9d9b241bf9f32527d7378d63ea40afa38443c6c3ceaea34'
             '78ce5e67b21758c767d727e56b20502f75dc4385ff9b6c6db312d8e8506f2df2')
 
 build() {
-  cd "otp_src_${pkgver/_1/}"
+  cd "otp_src_${pkgver/_/-}"
 
   ./configure --prefix=/usr --enable-smp-support --with-odbc
   make
 }
 
 package() {
-  cd "otp_src_${pkgver/_1/}"
+  cd "otp_src_${pkgver/_/-}"
 
   make DESTDIR="$pkgdir" install
 
   # Documentation
   install -d "$pkgdir/usr/share/doc/erlang"
-  install -m0644 "$srcdir/otp_src_${pkgver/_1/}/README.md" \
+  install -m0644 "$srcdir/otp_src_${pkgver/_/-}/README.md" \
     "$srcdir"/{README,COPYRIGHT} \
     "$pkgdir/usr/share/doc/erlang"
 
@@ -54,7 +54,7 @@ package() {
   cp -r "$srcdir/man" "$pkgdir/usr/lib/erlang"
 
   # License
-  install -Dm0644 "$srcdir/otp_src_${pkgver/_1/}/EPLICENCE" \
+  install -Dm0644 "$srcdir/otp_src_${pkgver/_/-}/EPLICENCE" \
     "$pkgdir/usr/share/licenses/$pkgname/EPLICENCE"
 
   # Remove files that are packaged as erlang-unixodbc
diff --git a/community/erlang/PKGBUILD b/community/erlang/PKGBUILD
index acdff8c7a..3f2dcb7d6 100644
--- a/community/erlang/PKGBUILD
+++ b/community/erlang/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 103793 2014-01-11 20:08:27Z eric $
+# $Id: PKGBUILD 105463 2014-02-08 18:29:03Z arodseth $
 # Maintainer: Lukas Fleischer <archlinux@cryptocrack.de>
 # Maintainer: Alexander Rødseth <rodseth@gmail.com>
 # Contributor: Vesa Kaihlavirta <vesa@archlinux.org>
@@ -8,8 +8,8 @@
 
 pkgbase=erlang
 pkgname=('erlang' 'erlang-unixodbc')
-pkgver=R16B03
-pkgrel=5
+pkgver=R16B03_1
+pkgrel=1
 arch=('x86_64' 'i686')
 url='http://www.erlang.org/'
 license=('custom')
@@ -20,14 +20,14 @@ source=("http://www.erlang.org/download/otp_src_${pkgver/_/-}.tar.gz"
         'epmd.service'
         'epmd.socket'
         'epmd.conf')
-sha256sums=('6133b3410681a5c934e54c76eee1825f96dead8d6a12c31a64f6e160daf0bb06'
-            'a2038d32e7c940d5d04f7338406e11b723cac0d26e82d7834596105eea492452'
+sha256sums=('17ce53459bc5ceb34fc2da412e15ac8c23835a15fbd84e62c8d1852704747ee7'
+            '0f31bc7d7215aa4b6834b1a565cd7d6e3173e3b392fb870254bae5136499c39d'
             'b121ec9053fb37abca5f910a81c526f93ec30fe13b574a12209223b346886a9e'
             '998a759e4cea4527f9d9b241bf9f32527d7378d63ea40afa38443c6c3ceaea34'
             '78ce5e67b21758c767d727e56b20502f75dc4385ff9b6c6db312d8e8506f2df2')
 
 build() {
-  cd "otp_src_${pkgver/_1/}"
+  cd "otp_src_${pkgver/_/-}"
 
   ./configure --prefix=/usr --enable-smp-support --with-odbc
   make
@@ -42,13 +42,13 @@ package_erlang() {
   provides=('erlang-nox')
   conflicts=('erlang-nox')
 
-  cd "otp_src_${pkgver/_1/}"
+  cd "otp_src_${pkgver/_/-}"
 
   make DESTDIR="$pkgdir" install
 
   # Documentation
   install -d "$pkgdir/usr/share/doc/erlang"
-  install -m0644 "$srcdir/otp_src_${pkgver/_1/}/README.md" \
+  install -m0644 "$srcdir/otp_src_${pkgver/_/-}/README.md" \
     "$srcdir"/{README,COPYRIGHT} \
     "$pkgdir/usr/share/doc/erlang"
 
@@ -57,7 +57,7 @@ package_erlang() {
   cp -r "$srcdir/man" "$pkgdir/usr/lib/erlang/"
 
   # License
-  install -Dm0644 "$srcdir/otp_src_${pkgver/_1/}/EPLICENCE" \
+  install -Dm0644 "$srcdir/otp_src_${pkgver/_/-}/EPLICENCE" \
     "$pkgdir/usr/share/licenses/$pkgname/EPLICENCE"
 
   # Move over files that will be packaged as erlang-unixodbc
@@ -82,7 +82,7 @@ package_erlang-unixodbc() {
   mv "$srcdir/odbc.3.gz" "$pkgdir/usr/lib/erlang/man/man3/"
 
   # License
-  install -Dm0644 "$srcdir/otp_src_${pkgver/_1/}/EPLICENCE" \
+  install -Dm0644 "$srcdir/otp_src_${pkgver/_/-}/EPLICENCE" \
     "$pkgdir/usr/share/licenses/$pkgname/EPLICENCE"
 }
 
diff --git a/community/keepalived/PKGBUILD b/community/keepalived/PKGBUILD
index 5f7a8487f..275f53fc9 100644
--- a/community/keepalived/PKGBUILD
+++ b/community/keepalived/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 104971 2014-01-28 23:21:57Z seblu $
+# $Id: PKGBUILD 105469 2014-02-08 19:27:45Z seblu $
 # Maintainer: Sébastien Luttringer
 # Contributor: Andrea Zucchelli <zukka77@gmail.com>
 
 pkgname=keepalived
-pkgver=1.2.11
+pkgver=1.2.12
 pkgrel=1
 pkgdesc='Failover and monitoring daemon for LVS clusters'
 arch=('i686' 'x86_64')
@@ -13,7 +13,7 @@ backup=('etc/keepalived/keepalived.conf')
 depends=('openssl' 'popt' 'libnl1')
 source=("http://www.keepalived.org/software/$pkgname-$pkgver.tar.gz"
         'keepalived.service')
-md5sums=('6a5cee0d9e0a6b84b251b044cd8f3523'
+md5sums=('60f2564acc1e1faa0237b53cf4392d1f'
          '0a5171f4298528315e8a8004b55befb7')
 
 build() {
diff --git a/community/python-msgpack/PKGBUILD b/community/python-msgpack/PKGBUILD
new file mode 100644
index 000000000..486ea8c28
--- /dev/null
+++ b/community/python-msgpack/PKGBUILD
@@ -0,0 +1,50 @@
+# $Id: PKGBUILD 105444 2014-02-08 02:18:28Z seblu $
+# Maintainer: Sébastien "Seblu" Luttringer
+
+pkgbase=python-msgpack
+pkgname=('python-msgpack' 'python2-msgpack')
+pkgver=0.4.0
+pkgrel=2
+arch=('i686' 'x86_64')
+url='https://github.com/msgpack/msgpack-python'
+license=('Apache')
+makedepends=('cython' 'cython2' 'python-distribute' 'python2-distribute')
+checkdepends=('python-pytest' 'python2-pytest' 'python-six' 'python2-six')
+source=("http://pypi.python.org/packages/source/m/msgpack-python/msgpack-python-$pkgver.tar.gz")
+md5sums=('8b9ce43619fd1428bf7baddf57e38d1a')
+
+build() {
+  cd msgpack-python-$pkgver
+  python setup.py build --build-lib=build/python
+  python2 setup.py build --build-lib=build/python2
+  find build/python2 -type f -exec \
+    sed -i '1s,^#! \?/usr/bin/\(env \|\)python$,#!/usr/bin/python2,' {} \;
+}
+
+check() {
+  cd msgpack-python-$pkgver
+  msg2 'python'
+  PYTHONPATH=$PWD/build/python py.test test
+  msg2 'python2'
+  PYTHONPATH=$PWD/build/python2 py.test2 test
+}
+
+package_python-msgpack() {
+  pkgdesc='MessagePack serializer implementation for Python'
+  depends=('python')
+
+  cd msgpack-python-$pkgver
+  python setup.py build --build-lib=build/python \
+                  install --root="$pkgdir" --optimize=1
+}
+
+package_python2-msgpack() {
+  pkgdesc='MessagePack serializer implementation for Python2'
+  depends=('python2')
+
+  cd msgpack-python-$pkgver
+  python2 setup.py build --build-lib=build/python2 \
+                   install --root="$pkgdir" --optimize=1
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/community/virtualbox-modules-lts/PKGBUILD b/community/virtualbox-modules-lts/PKGBUILD
index 0d5ba2af0..f8d432691 100644
--- a/community/virtualbox-modules-lts/PKGBUILD
+++ b/community/virtualbox-modules-lts/PKGBUILD
@@ -1,12 +1,12 @@
-# $Id: PKGBUILD 104283 2014-01-17 05:32:15Z andyrtr $
-# Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl>
+# $Id: PKGBUILD 105457 2014-02-08 12:33:27Z bpiotrowski $
+# Contributor: Bartłomiej Piotrowski <bpiotrowski@archlinux.org>
 # Contributor: Ionut Biru <ibiru@archlinux.org>
 # Contributor: Sébastien Luttringer
 
 pkgbase=virtualbox-modules-lts
 pkgname=('virtualbox-host-modules-lts' 'virtualbox-guest-modules-lts')
 pkgver=4.3.6
-pkgrel=4
+pkgrel=5
 arch=('i686' 'x86_64')
 url='http://virtualbox.org'
 license=('GPL')
diff --git a/extra/avogadro/PKGBUILD b/extra/avogadro/PKGBUILD
index e7fbea6a3..da6afa824 100644
--- a/extra/avogadro/PKGBUILD
+++ b/extra/avogadro/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 205472 2014-02-05 17:31:40Z andrea $
+# $Id: PKGBUILD 205595 2014-02-08 15:48:17Z andrea $
 # Maintainer:
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Nick B <Shirakawasuna at gmail _dot_com>
 
 pkgname=avogadro
 pkgver=1.1.1
-pkgrel=1
+pkgrel=2
 pkgdesc="An advanced molecular editor based on Qt"
 arch=('i686' 'x86_64')
 url="http://avogadro.openmolecules.net/wiki/Main_Page"
diff --git a/extra/ktorrent/PKGBUILD b/extra/ktorrent/PKGBUILD
index 4d9053872..ab0e6ba2d 100644
--- a/extra/ktorrent/PKGBUILD
+++ b/extra/ktorrent/PKGBUILD
@@ -1,23 +1,34 @@
-# $Id: PKGBUILD 176930 2013-02-02 18:16:57Z andrea $
+# $Id: PKGBUILD 205598 2014-02-08 16:27:50Z andrea $
 # Maintainer: Ronald van Haren <ronald.archlinux.org>
 # Contributor: Travis Willard <travisw@wmpub.ca>
 # Contributor: Georg Grabler <ggrabler@gmail.com>
 
 pkgname=ktorrent
 pkgver=4.3.1
-pkgrel=1
+pkgrel=2
 pkgdesc="A powerful BitTorrent client for KDE"
 arch=('i686' 'x86_64')
-url='http://ktorrent.org/'
+url='http://ktorrent.pwsp.net/'
 license=('GPL2')
-depends=('libktorrent' 'kdebase-workspace' 'taglib')
-makedepends=('automoc4' 'cmake' 'boost')
-source=("http://ktorrent.org/downloads/${pkgver}/${pkgname}-${pkgver}.tar.bz2")
+depends=('libktorrent' 'kdebase-runtime' 'taglib')
+makedepends=('automoc4' 'cmake' 'boost' 'kdebase-workspace')
 install=${pkgname}.install
-sha1sums=('6b56bab48dd07805225c3d4d5d5d1c4c1def241e')
+source=("http://ktorrent.pwsp.net/downloads/${pkgver}/${pkgname}-${pkgver}.tar.bz2"
+        'kde412.patch'
+        'kdebug-315239.patch')
+sha1sums=('6b56bab48dd07805225c3d4d5d5d1c4c1def241e'
+          'f2c0e05913b2f21b593818e2cd3547d09f86be86'
+          'd247aecbbbbbda3eef8dcb51d3db244b1c845f85')
 
-build() {
+prepare() {
 	mkdir build
+
+  cd ${pkgname}-${pkgver}
+  patch -p1 -i "${srcdir}"/kde412.patch
+  patch -p1 -i "${srcdir}"/kdebug-315239.patch
+}
+
+build() {
 	cd build
 	cmake ../${pkgname}-${pkgver} \
 	  -DCMAKE_BUILD_TYPE=Release \
diff --git a/extra/ktorrent/kde412.patch b/extra/ktorrent/kde412.patch
new file mode 100644
index 000000000..445a645d2
--- /dev/null
+++ b/extra/ktorrent/kde412.patch
@@ -0,0 +1,18 @@
+From: Christoph Feck <christoph@maxiom.de>
+Date: Fri, 19 Oct 2012 08:56:22 +0000
+Subject: SVN_SILENT link
+X-Git-Url: http://quickgit.kde.org/?p=ktorrent.git&a=commitdiff&h=3ef62c439027acc0a166101419fff4bc0c69013d
+---
+SVN_SILENT link
+---
+
+
+--- a/plugins/ipfilter/tests/CMakeLists.txt
++++ b/plugins/ipfilter/tests/CMakeLists.txt
+@@ -1,4 +1,4 @@
+ set(ipblocklisttest_SRCS ipblocklisttest.cpp ../ipblocklist.cpp)
+ kde4_add_unit_test(ipblocklisttest TESTNAME ipblocklisttest ${ipblocklisttest_SRCS})
+-target_link_libraries(ipblocklisttest ${QT_QTTEST_LIBRARY} ktorrent)
++target_link_libraries(ipblocklisttest ${QT_QTCORE_LIBRARY} ${QT_QTNETWORK_LIBRARY} ${QT_QTTEST_LIBRARY} ${LIBKTORRENT_LIBRARIES})
+ 
+
diff --git a/extra/ktorrent/kdebug-315239.patch b/extra/ktorrent/kdebug-315239.patch
new file mode 100644
index 000000000..524a10d88
--- /dev/null
+++ b/extra/ktorrent/kdebug-315239.patch
@@ -0,0 +1,65 @@
+commit 3dfcbeb9765e99f9b99951134b17268eb7a617d2
+Author: Joris Guisson <joris.guisson@gmail.com>
+Date:   Thu Aug 1 13:19:29 2013 +0200
+
+    Backport ipfilter extraction fixes from master branch to 4.3 branch
+    
+    BUG: 315239
+
+diff --git a/ChangeLog b/ChangeLog
+index c5ae9da..42c48ff 100644
+--- a/ChangeLog
++++ b/ChangeLog
+@@ -1,3 +1,6 @@
++Changes in 4.3.2:
++- Backport ipfilter extraction fixes from master branch (315239)
++
+ Changes in 4.3.1:
+ - Fix new custom groups not appearing in add to group submenu (307230)
+ - Fix crash when right clicking on some locations in the GroupView due to 0 pointer (307160)
+diff --git a/plugins/ipfilter/downloadandconvertjob.cpp b/plugins/ipfilter/downloadandconvertjob.cpp
+index d3092ac..4080c2a 100644
+--- a/plugins/ipfilter/downloadandconvertjob.cpp
++++ b/plugins/ipfilter/downloadandconvertjob.cpp
+@@ -114,12 +114,13 @@ namespace kt
+ 		
+ 		//now determine if it's ZIP or TXT file
+ 		KMimeType::Ptr ptr = KMimeType::findByPath(temp);
++        Out(SYS_IPF|LOG_NOTICE) << "Mimetype: " << ptr->name() << endl;
+ 		if (ptr->name() == "application/zip")
+ 		{
+ 			active_job = KIO::file_move(temp,QString(kt::DataDir() + QLatin1String("level1.zip")),-1,KIO::HideProgressInfo|KIO::Overwrite);
+ 			connect(active_job,SIGNAL(result(KJob*)),this,SLOT(extract(KJob*)));
+ 		}
+-		else if (ptr->name() == "application/x-gzip" || ptr->name() == "application/x-bzip")
++		else if (ptr->name() == "application/x-gzip" || ptr->name() == "application/x-bzip" || ptr->name() == "application/gzip")
+ 		{
+ 			active_job = new bt::DecompressFileJob(temp,QString(kt::DataDir() + "level1.txt"));
+ 			connect(active_job,SIGNAL(result(KJob*)),this,SLOT(convert(KJob*)));
+@@ -174,23 +175,10 @@ namespace kt
+ 		}
+ 		
+ 		QString destination = kt::DataDir() + "level1.txt";
+-		if (zip->directory()->entries().contains("splist.txt"))
++        QStringList entries = zip->directory()->entries();
++		if (entries.count() >= 1)
+ 		{
+-			active_job = new bt::ExtractFileJob(zip,"splist.txt",destination);
+-			connect(active_job,SIGNAL(result(KJob*)),this,SLOT(convert(KJob*)));
+-			unzip = true;
+-			active_job->start();
+-		}
+-		else if (zip->directory()->entries().contains("level1.txt"))
+-		{
+-			active_job = new bt::ExtractFileJob(zip,"level1.txt",destination);
+-			connect(active_job,SIGNAL(result(KJob*)),this,SLOT(convert(KJob*)));
+-			unzip = true;
+-			active_job->start();
+-		}
+-		else if (zip->directory()->entries().contains("ipfilter.dat"))
+-		{
+-			active_job = new bt::ExtractFileJob(zip,"ipfilter.dat",destination);
++			active_job = new bt::ExtractFileJob(zip,entries.front(),destination);
+ 			connect(active_job,SIGNAL(result(KJob*)),this,SLOT(convert(KJob*)));
+ 			unzip = true;
+ 			active_job->start();
diff --git a/extra/whois/PKGBUILD b/extra/whois/PKGBUILD
index 7ccd5f456..425c5c379 100644
--- a/extra/whois/PKGBUILD
+++ b/extra/whois/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 203047 2014-01-02 17:53:12Z giovanni $
+# $Id: PKGBUILD 205600 2014-02-08 18:07:53Z giovanni $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
 
 pkgname=whois
-pkgver=5.1.0
+pkgver=5.1.1
 pkgrel=1
 pkgdesc="The whois client by Marco d'Itri"
 arch=('i686' 'x86_64')
@@ -13,7 +13,7 @@ depends=('libidn')
 makedepends=('perl')
 backup=('etc/whois.conf')
 source=("http://ftp.debian.org/debian/pool/main/w/whois/${pkgname}_${pkgver}.tar.xz")
-md5sums=('e16cc6ca56a6834ab60ace26215d6b0c')
+md5sums=('aa4561134a03e22e2d759748ca676a97')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/libre/blender-libre/PKGBUILD b/libre/blender-libre/PKGBUILD
deleted file mode 100644
index cbd87f8b2..000000000
--- a/libre/blender-libre/PKGBUILD
+++ /dev/null
@@ -1,146 +0,0 @@
-# Maintainer: Márcio Silva <coadde@lavabit.com>
-
-_pkgname=blender
-epoch=10
-_pkgver=2.69
-pkgrel=3
-_jpgver=1.5
-_pyver=3.3
-
-_spn=false
-[[ $_spn == true ]] && {
-  _spnname=-spacenav
-  _spndesc=' (with spacenav support)'
-}
-
-pkgname=$_pkgname$_spnname-libre
-pkgver=$_pkgver
-pkgdesc='Fully integrated 3D graphics creation suite, without nonfree cuda support'$_spndesc
-arch=(
-  mips64el
-  x86_64
-  i686
-)
-license=GPL
-url=http://www.$_pkgname.org
-depends=(
-  desktop-file-utils
-  ffmpeg
-  fftw
-  freetype2
-  hicolor-icon-theme
-  jack
-  #jemalloc
-  libpng
-  libtiff
-  openal
-  openexr-libre
-  openimageio
-  'opencollada=20131031'
-  opencolorio
-  openshadinglanguage
-  shared-mime-info
-  xdg-utils
-)
-[[ $_spn == true ]] && depends+=(libspnav)
-optdepends=(
-  'bullet: for Rigid Bodies and Physics Simulation'
-  'xcftools: for import GIMP images to scene (pcr repo)'
-  'povray-libre: for optional renderer with POV-Ray'
-  'blender-addon-luxrender: for optional renderer and exporter with LuxRender'
-  'blender-addon-mitsuba: for optional renderer and exporter with Mitsuba (pcr repo)'
-  'blender-addon-ogre: for export to Ogre3D formats (pcr repo)'
-  'blender-addon-yafaray: for optional renderer with YafaRay (pcr repo)'
-)
-makedepends=(
-  boost
-  cmake
-  mesa
-)
-provides=($_pkgname)
-[[ $_spn == true ]] && provides+=("$_pkgname-libre=$epoch:$pkgver")
-conflicts=($_pkgname)
-[[ $_spn == true ]] && conflicts+=($_pkgname-libre)
-replaces=$_pkgname
-options=(!strip)
-install=$_pkgname-libre.install
-source=http://download.$_pkgname.org/source/$_pkgname-$pkgver.tar.gz
-sha512sums=f4de1f5a0a7868ee509b57ef65962a6c2af4c2bc7328db6ebe7b8e05f771c06efea92977f7a64433e8383382a33dbd73cb42b2bf872e63410e55c19ddd133142
-
-prepare() {
-  cd $srcdir/$_pkgname-$pkgver
-
-  msg 'renaming wrong OS name'
-  _OS=$(uname -o)
-  [[ $_OS == GNU ]] && sed -i 's|BUILD_PLATFORM;|"GNU";|' source/creator/buildinfo.c
-  [[ $_OS == GNU/Linux ]] && sed -i 's|BUILD_PLATFORM;|"GNU/Linux";|' source/creator/buildinfo.c
-  [[ $_OS == GNU/kFreeBSD ]] && sed -i 's|BUILD_PLATFORM;|"GNU/kFreeBSD";|' source/creator/buildinfo.c
-  sed -i 's|Linux, Mac OS X, Windows and FreeBSD|GNU and BSD|
-          s|Linux, FreeBSD|GNU and BSD|
-          s|Unpack the archive, Then run the Blender executable.|Intall from Parabola repo (pacman -S '"$pkgname"'), Then run blender.|
-          \|Windows|d;\|Mac OS X|d
-          s|The downloaded Blender package includes|The '"${pkgname^}"' package includes|
-         ' release/text/readme.html
-  sed -i 's|Linux|GNU|
-         ' release/scripts/{addons/game_engine_save_as_runtime,modules/bl_i18n_utils/utils_rtl}.py
-  sed -i 's| (.so under Linux, .dll under windows...)| (.so under GNU or BSD, .dll under Wine or ReactOS...)|
-         ' release/scripts/{addons/ui_translate,modules/bl_i18n_utils}/settings.py
-
-  msg 'removing Open Source term'
-  sed -i 's|free, open source|free|
-          s|free and open-source|free|
-          s|open-source and free|free|
-         ' release/text/readme.html
-
-  msg 'fixing povray-libre path and desc'
-  sed -i "s|FILE_PATH',|FILE_PATH',\n                default='/usr/bin/povray',|
-          s|both POV-Ray 3[.]7 and this script are beta|this script is beta|
-         " release/scripts/addons/render_povray/__init__.py  
-
-  mkdir -v build
-}
-
-build() {
-  cd $srcdir/$_pkgname-$pkgver/build
-
-  [[ $CARCH == x86_64 || $CARCH == i686 ]] && _SSE=ON _SSE2=ON || _SSE=OFF _SSE2=OFF
-  [[ $_spn == true ]] && _NDOF=ON || _NDOF=OFF
-  cmake ..\
-    -DCMAKE_BUILD_TYPE=Release\
-    -DCMAKE_INSTALL_PREFIX=/usr\
-    -DOPENIMAGEIO_ROOT_DIR=/usr\
-    -DOPENJPEG_INCLUDE_DIR=/usr/include/openjpeg-$_jpgver\
-    -DPYTHON_INCLUDE_DIRS=/usr/include/python${_pyver}m\
-    -DPYTHON_LIBPATH=/usr/lib\
-    -DPYTHON_LIBRARY=python${_pyver}m\
-    -DPYTHON_VERSION=$_pyver\
-    -DSUPPORT_SSE_BUILD=$_SSE\
-    -DSUPPORT_SSE2_BUILD=$_SSE2\
-    -DWITH_BULLET=ON\
-    -DWITH_CODEC_FFMPEG=ON\
-    -DWITH_CODEC_SNDFILE=ON\
-    -DWITH_CYCLES=ON\
-    -DWITH_CYCLES_CUDA_BINARIES=OFF\
-    -DWITH_CYCLES_OSL=ON\
-    -DWITH_FFTW3=ON\
-    -DWITH_GAMEENGINE=ON\
-    -DWITH_IMAGE_REDCODE=ON\
-    -DWITH_INPUT_NDOF=$_NDOF\
-    -DWITH_INSTALL_PORTABLE=OFF\
-    -DWITH_JACK=ON\
-    -DWITH_JACK_DYNLOAD=OFF\
-    -DWITH_MEM_JEMALLOC=OFF\
-    -DWITH_MOD_OCEANSIM=ON\
-    -DWITH_OPENCOLLADA=ON\
-    -DWITH_PLAYER=ON\
-    -DWITH_PYTHON_INSTALL=OFF\
-    -DWITH_SYSTEM_GLEW=ON
-  make $MAKEFLAGS
-  make
-}
-
-package() {
-  cd $srcdir/$_pkgname-$pkgver/build
-  make DESTDIR=$pkgdir install
-  python -m compileall $pkgdir/usr/share/$_pkgname
-}