diff options
Diffstat (limited to 'community')
| -rw-r--r-- | community/duplicity/PKGBUILD | 17 | ||||
| -rw-r--r-- | community/duplicity/gpg-encode.patch | 216 | ||||
| -rw-r--r-- | community/erlang-nox/PKGBUILD | 18 | ||||
| -rw-r--r-- | community/erlang/PKGBUILD | 20 | ||||
| -rw-r--r-- | community/keepalived/PKGBUILD | 6 | ||||
| -rw-r--r-- | community/python-msgpack/PKGBUILD | 50 | ||||
| -rw-r--r-- | community/virtualbox-modules-lts/PKGBUILD | 6 |
7 files changed, 304 insertions, 29 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') |