diff options
-rw-r--r-- | community/amsynth/PKGBUILD | 27 | ||||
-rw-r--r-- | community/amsynth/amsynth.install | 11 | ||||
-rw-r--r-- | community/jemalloc/PKGBUILD | 6 | ||||
-rw-r--r-- | community/libvirt-glib/PKGBUILD | 8 | ||||
-rw-r--r-- | community/libvirt-python/PKGBUILD | 10 | ||||
-rw-r--r-- | community/python-pymongo/PKGBUILD | 8 | ||||
-rw-r--r-- | community/python-sqlalchemy/PKGBUILD | 30 | ||||
-rw-r--r-- | community/sipcalc/PKGBUILD | 25 | ||||
-rw-r--r-- | community/sylpheed/PKGBUILD | 6 | ||||
-rw-r--r-- | extra/bluez/PKGBUILD | 6 | ||||
-rw-r--r-- | extra/libtorrent-rasterbar/PKGBUILD | 6 | ||||
-rw-r--r-- | extra/live-media/PKGBUILD | 6 | ||||
-rw-r--r-- | extra/mercurial/PKGBUILD | 6 | ||||
-rw-r--r-- | extra/python-lxml/PKGBUILD | 12 | ||||
-rwxr-xr-x | extra/python-numpy/PKGBUILD | 16 | ||||
-rw-r--r-- | extra/python-numpy/numpy-insecure-mktemp-use.patch | 263 | ||||
-rw-r--r-- | extra/python-zope-interface/PKGBUILD | 14 | ||||
-rw-r--r-- | extra/sqlite/PKGBUILD | 10 | ||||
-rw-r--r-- | extra/xorg-xauth/PKGBUILD | 10 |
19 files changed, 143 insertions, 337 deletions
diff --git a/community/amsynth/PKGBUILD b/community/amsynth/PKGBUILD new file mode 100644 index 000000000..038fecfa2 --- /dev/null +++ b/community/amsynth/PKGBUILD @@ -0,0 +1,27 @@ +# $Id$ +# Maintainer : speps <speps at aur dot archlinux dot org> +# Contributor: Alessio Biancalana <dottorblaster@gmail.com> + +pkgname=amsynth +pkgver=1.4.1 +pkgrel=1 +pkgdesc="Analogue Modeling SYNTHesizer" +arch=('i686' 'x86_64') +url="http://code.google.com/p/$pkgname/" +license=('GPL') +depends=('gtkmm' 'jack' 'liblo' 'desktop-file-utils') +makedepends=('dssi' 'ladspa') +install="$pkgname.install" +source=("http://downloads.sourceforge.net/project/amsynthe/amsynth-$pkgver.tar.gz") +md5sums=('ea3815142cf2000572f40c64b21fd982') + +build() { + cd $pkgname-$pkgver + ./configure --prefix=/usr + make +} + +package() { + cd $pkgname-$pkgver + make DESTDIR="$pkgdir/" install +} diff --git a/community/amsynth/amsynth.install b/community/amsynth/amsynth.install new file mode 100644 index 000000000..e111ef946 --- /dev/null +++ b/community/amsynth/amsynth.install @@ -0,0 +1,11 @@ +post_install() { + update-desktop-database -q +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/community/jemalloc/PKGBUILD b/community/jemalloc/PKGBUILD index e9a2a950d..978254f1b 100644 --- a/community/jemalloc/PKGBUILD +++ b/community/jemalloc/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 106301 2014-02-27 08:35:14Z mtorromeo $ +# $Id: PKGBUILD 108815 2014-04-04 12:17:16Z mtorromeo $ # Maintainer: Massimiliano Torromeo <massimiliano.torromeo@gmail.com> # Contributor: Kovivchak Evgen <oneonfire@gmail.com> pkgname=jemalloc -pkgver=3.5.1 +pkgver=3.6.0 pkgrel=1 pkgdesc="General-purpose scalable concurrent malloc implementation" arch=('i686' 'x86_64') @@ -30,4 +30,4 @@ package() { install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING" } -sha256sums=('1a09f2570167ebc5fba4ddcc09176575d8acbb77017faf27797b9ab7f38f349f') +sha256sums=('e16c2159dd3c81ca2dc3b5c9ef0d43e1f2f45b04548f42db12e7c12d7bdf84fe') diff --git a/community/libvirt-glib/PKGBUILD b/community/libvirt-glib/PKGBUILD index a68820cb9..dbdea88ad 100644 --- a/community/libvirt-glib/PKGBUILD +++ b/community/libvirt-glib/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 99889 2013-10-31 02:18:18Z allan $ +# $Id: PKGBUILD 108799 2014-04-04 07:49:23Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Stefano Facchini <stefano.facchini@gmail.com> pkgname=libvirt-glib -pkgver=0.1.7 -pkgrel=2 +pkgver=0.1.8 +pkgrel=1 pkgdesc="GLib bindings for libvirt" arch=('i686' 'x86_64') url="http://libvirt.org" @@ -12,7 +12,7 @@ license=('LGPL2.1') depends=('libvirt') makedepends=('intltool' 'gobject-introspection' 'vala') source=(ftp://libvirt.org/libvirt/glib/$pkgname-$pkgver.tar.gz) -sha256sums=('39652c07d95f980ff30b39e0fd072e768fb85d778d65432da24b17dee9d36429') +sha256sums=('da0e45952dbe1d5d9fde4f845f3a10763e7fed0b1e45906a46fdb74b777aa751') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/community/libvirt-python/PKGBUILD b/community/libvirt-python/PKGBUILD index 319f3cf2c..733223a9a 100644 --- a/community/libvirt-python/PKGBUILD +++ b/community/libvirt-python/PKGBUILD @@ -3,7 +3,7 @@ # Contributor: Jonathan Wiersma <archaur at jonw dot org> pkgname=libvirt-python -pkgver=1.2.2 +pkgver=1.2.3 pkgrel=1 pkgdesc="libvirt python binding" arch=('i686' 'x86_64') @@ -13,15 +13,15 @@ depends=('python2' 'libvirt') makedepends=('git') options=('emptydirs') install="libvirt-python.install" -source=("$pkgname::git://libvirt.org/libvirt-python.git#tag=v1.2.1") -md5sums=('SKIP') +source=("http://libvirt.org/sources/python/libvirt-python-$pkgver.tar.gz") +md5sums=('6916d24595c5cc939e698926cd22888c') build() { - cd "$srcdir/$pkgname" + cd "$srcdir/$pkgname-$pkgver" python2 setup.py build } package() { - cd "$srcdir/$pkgname" + cd "$srcdir/$pkgname-$pkgver" python2 setup.py install --root=$pkgdir } diff --git a/community/python-pymongo/PKGBUILD b/community/python-pymongo/PKGBUILD index f49c68be7..f5f900e4a 100644 --- a/community/python-pymongo/PKGBUILD +++ b/community/python-pymongo/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 108476 2014-03-27 14:48:10Z fyan $ +# $Id: PKGBUILD 108791 2014-04-04 02:32:21Z fyan $ # Maintainer: Alexander Rødseth <rodseth@gmail.com> # Maintainer: Felix Yan <felixonmars@gmail.com> # Contributor: Thomas S Hatch <thatch45@gmail.com> @@ -6,8 +6,8 @@ pkgbase=python-pymongo pkgname=('python-pymongo' 'python2-pymongo') -pkgver=2.6.3 -pkgrel=3 +pkgver=2.7 +pkgrel=1 pkgdesc='Python module for using MongoDB' arch=('x86_64' 'i686') license=('APACHE') @@ -15,7 +15,7 @@ url='http://pypi.python.org/pypi/pymongo/' makedepends=('python-setuptools' 'python2-setuptools') optdepends=('mongodb: High-performance schema-free document-oriented database') source=("http://pypi.python.org/packages/source/p/pymongo/pymongo-$pkgver.tar.gz") -sha256sums=('cabe1d785ad5db6ed8ff70dcb9c987958fc75400f066ec78911ca3f37184a4e2') +sha256sums=('8320bbbb8ca76de86bd47c253cfbfc4aedae3439fc57f6a9f8fdfa15a00bd601') build() { cp -a "pymongo-$pkgver" "pymongo2-$pkgver" diff --git a/community/python-sqlalchemy/PKGBUILD b/community/python-sqlalchemy/PKGBUILD index 73bdf2b26..6df919ed4 100644 --- a/community/python-sqlalchemy/PKGBUILD +++ b/community/python-sqlalchemy/PKGBUILD @@ -1,31 +1,39 @@ -# $Id: PKGBUILD 108503 2014-03-27 14:48:29Z fyan $ -# Maintainer: Angel Velasquez <angvp@archlinux.org> +# $Id: PKGBUILD 108809 2014-04-04 10:16:01Z fyan $ +# Maintainer: Angel Velasquez <angvp@archlinux.org> +# Maintainer: Felix Yan <felixonmars@gmail.com> # Contributor: Sébastien Luttringer <seblu@aur.archlinux.org> pkgbase=python-sqlalchemy pkgname=('python-sqlalchemy' 'python2-sqlalchemy') -pkgver=0.9.3 -pkgrel=2 +pkgver=0.9.4 +pkgrel=1 arch=('i686' 'x86_64') # python2 package contain .so url="http://www.sqlalchemy.org/" -license=('custom: MIT') -makedepends=('python' 'python2' 'python-setuptools' 'python2-setuptools' 'python-nose' 'python2-nose') +license=('MIT') +makedepends=('python' 'python2' 'python-setuptools' 'python2-setuptools') +checkdepends=('python-pytest' 'python2-pytest' 'python-mock' 'python2-mock') source=("https://pypi.python.org/packages/source/S/SQLAlchemy/SQLAlchemy-$pkgver.tar.gz") -md5sums=('a27989b9d4b3f14ea0b1600aa45559c4') +md5sums=('c008ea5e2565ec1418ee8461393a99b1') -build() { +prepare() { cp -a SQLAlchemy-$pkgver SQLAlchemy2-$pkgver +} + +build() { cd SQLAlchemy-$pkgver python setup.py build + cd ../SQLAlchemy2-$pkgver python2 setup.py build } check() { + # Tests failing cd SQLAlchemy-${pkgver} - python setup.py check - python2 setup.py check - + #python setup.py test + + cd ../SQLAlchemy2-$pkgver + #python2 setup.py test } package_python-sqlalchemy() { diff --git a/community/sipcalc/PKGBUILD b/community/sipcalc/PKGBUILD new file mode 100644 index 000000000..4d98be1ee --- /dev/null +++ b/community/sipcalc/PKGBUILD @@ -0,0 +1,25 @@ +# Maintainer: Florian Pritz <bluewind@xinu.at> +# Contributor: Mike Sampson <mike at sambodata dot com> +# Contributor: Tomasz Cielecki <tomasz@ostebaronen.dk> +pkgname=sipcalc +pkgver=1.1.6 +pkgrel=2 +pkgdesc="an advanced console based ip subnet calculator." +arch=('i686' 'x86_64') +url="http://www.routemeister.net/projects/sipcalc/" +license=('BSD') +depends=('glibc') +source=(http://www.routemeister.net/projects/sipcalc/files/$pkgname-$pkgver.tar.gz) +md5sums=('e431c64387f2c8d20e96ad1d7931a845') + +build() { + cd "$srcdir/$pkgname-$pkgver" + ./configure --prefix=/usr + make +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + make DESTDIR="$pkgdir/" install + install -m644 -D COPYING "$pkgdir/usr/share/licenses/$pkgname/LICENSE" +} diff --git a/community/sylpheed/PKGBUILD b/community/sylpheed/PKGBUILD index d4d0d2752..2456ae056 100644 --- a/community/sylpheed/PKGBUILD +++ b/community/sylpheed/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 108703 2014-04-01 17:09:52Z speps $ +# $Id: PKGBUILD 108819 2014-04-04 16:08:03Z speps $ # Maintainer: speps <speps at aur dot archlinux dot org> # Contributor: Alexander Fehr <pizzapunk gmail com> # Contributor: dorphell <dorphell@archlinux.org> pkgname=sylpheed -pkgver=3.4.0 +pkgver=3.4.1 pkgrel=1 pkgdesc="Lightweight and user-friendly e-mail client" arch=('i686' 'x86_64') @@ -14,7 +14,7 @@ depends=('compface' 'gpgme' 'gtkspell' 'desktop-file-utils') makedepends=('openssl') install="$pkgname.install" source=("http://sylpheed.sraoss.jp/$pkgname/v${pkgver%.*}/$pkgname-$pkgver.tar.bz2") -md5sums=('6cef3bb0ef2de6456dc1710f58e4db1f') +md5sums=('9071bb341a6d96244fe7cd5ff013c70d') build() { cd $pkgname-$pkgver diff --git a/extra/bluez/PKGBUILD b/extra/bluez/PKGBUILD index f4681e439..cab4e2e88 100644 --- a/extra/bluez/PKGBUILD +++ b/extra/bluez/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 207518 2014-03-11 17:59:19Z andyrtr $ +# $Id: PKGBUILD 209803 2014-04-04 13:10:29Z andyrtr $ # Maintainer: Tom Gundersen <teg@jklm.no> # Contributor: Andrea Scarpino <andrea@archlinux.org> # Contributor: Geoffroy Carrier <geoffroy@archlinux.org> pkgbase=bluez pkgname=('bluez' 'bluez-utils' 'bluez-libs' 'bluez-cups' 'bluez-hid2hci' 'bluez-plugins') -pkgver=5.16 +pkgver=5.17 pkgrel=1 url="http://www.bluez.org/" arch=('i686' 'x86_64') @@ -15,7 +15,7 @@ source=(http://www.kernel.org/pub/linux/bluetooth/${pkgname}-${pkgver}.tar.xz 0001-Allow-using-obexd-without-systemd-in-the-user-session.patch bluetooth.modprobe) # see https://www.kernel.org/pub/linux/bluetooth/sha256sums.asc -sha256sums=('c8d5094a21a799dca9cdcd99651dc19d521af514b22b8178fc787c454cdbb163' +sha256sums=('0bd7f009225fff83ba4b3697a6b04d04454ef2cd15d6bb2bd62591c44cfe973a' '896a1403d9b7258c4fb0d41f3a6f70fd51eaa1115ab3f4259f3dbbe02b55766b' '46c021be659c9a1c4e55afd04df0c059af1f3d98a96338236412e449bf7477b4') diff --git a/extra/libtorrent-rasterbar/PKGBUILD b/extra/libtorrent-rasterbar/PKGBUILD index 342d4cef9..fe0840997 100644 --- a/extra/libtorrent-rasterbar/PKGBUILD +++ b/extra/libtorrent-rasterbar/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 206432 2014-02-26 06:00:38Z bpiotrowski $ +# $Id: PKGBUILD 209784 2014-04-04 06:21:48Z fyan $ # Maintainer : Ionut Biru <ibiru@archlinux.org> # Contributor: Hugo Doria <hugo@archlinux.org> pkgname=libtorrent-rasterbar -pkgver=0.16.15 +pkgver=0.16.16 pkgrel=1 epoch=1 pkgdesc="A C++ library that aims to be a good alternative to all the other bittorrent implementations around" @@ -14,7 +14,7 @@ depends=('boost-libs' 'geoip' 'python2') makedepends=('boost') options=('!emptydirs') source=(http://downloads.sourceforge.net/sourceforge/libtorrent/$pkgname-$pkgver.tar.gz) -sha1sums=('8657a493fb2ee4e6bf55e484deb922d23b65818d') +sha1sums=('de8faed5cbc09baddb2748cb7b75edd07ab0addc') build() { cd $pkgname-$pkgver diff --git a/extra/live-media/PKGBUILD b/extra/live-media/PKGBUILD index 9a13af884..a6d65edf1 100644 --- a/extra/live-media/PKGBUILD +++ b/extra/live-media/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 208633 2014-03-24 18:14:14Z giovanni $ +# $Id: PKGBUILD 209812 2014-04-04 16:31:16Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Gilles CHAUVIN <gcnweb@gmail.com> pkgname=live-media -pkgver=2014.03.18 +pkgver=2014.03.25 pkgrel=1 pkgdesc="A set of C++ libraries for multimedia streaming" arch=('i686' 'x86_64') @@ -12,7 +12,7 @@ url="http://live555.com/liveMedia" depends=('gcc-libs') options=('staticlibs') source=("http://live555.com/liveMedia/public/live.${pkgver}.tar.gz") -md5sums=('2020012b2dfc66972a29a89a95f369a8') +md5sums=('b2e1946260716252054cf2a81e061ed3') build() { cd ${srcdir}/live diff --git a/extra/mercurial/PKGBUILD b/extra/mercurial/PKGBUILD index 6a3c5043a..dc40217c5 100644 --- a/extra/mercurial/PKGBUILD +++ b/extra/mercurial/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 207413 2014-03-08 17:09:21Z giovanni $ +# $Id: PKGBUILD 209809 2014-04-04 16:27:12Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Douglas Soares de Andrade <douglas@archlinux.org> pkgname=mercurial -pkgver=2.9.1 +pkgver=2.9.2 pkgrel=1 pkgdesc="A scalable distributed SCM tool" arch=('i686' 'x86_64') @@ -14,7 +14,7 @@ optdepends=('tk: for the hgk GUI') backup=('etc/mercurial/hgrc') source=("http://mercurial.selenic.com/release/${pkgname}-${pkgver}.tar.gz" 'mercurial.profile') -md5sums=('56b3732f0f558f3cc986c9323ca8d17f' +md5sums=('1caeed1bea1232598fc5ce5d6d109f56' '43e1d36564d4c7fbe9a091d3ea370a44') package() { diff --git a/extra/python-lxml/PKGBUILD b/extra/python-lxml/PKGBUILD index 81595fd0b..2aee8bfe8 100644 --- a/extra/python-lxml/PKGBUILD +++ b/extra/python-lxml/PKGBUILD @@ -1,15 +1,17 @@ -# $Id: PKGBUILD 208846 2014-03-27 14:43:31Z fyan $ -# Maintainer: Angel Velasquez <angvp@archlinux.org> +# $Id: PKGBUILD 209777 2014-04-04 04:29:43Z fyan $ +# Maintainer: Angel Velasquez <angvp@archlinux.org> +# Maintainer: Felix Yan <felixonmars@gmail.com> + pkgbase=python-lxml pkgname=('python-lxml' 'python2-lxml' 'python-lxml-docs') -pkgver=3.3.3 -pkgrel=2 +pkgver=3.3.4 +pkgrel=1 arch=('i686' 'x86_64') license=('BSD' 'custom') url="http://lxml.de/" makedepends=('python2' 'python' 'libxslt' 'python-cssselect' 'python2-cssselect') source=(http://pypi.python.org/packages/source/l/lxml/lxml-${pkgver}.tar.gz{,.asc}) -md5sums=('f2675837b4358a5ecab5fd9a783fd0e5' +md5sums=('79e7b190563bf280c50ec20087f40dfa' 'SKIP') check() { diff --git a/extra/python-numpy/PKGBUILD b/extra/python-numpy/PKGBUILD index 94b414122..0a766d512 100755 --- a/extra/python-numpy/PKGBUILD +++ b/extra/python-numpy/PKGBUILD @@ -1,28 +1,22 @@ -# $Id: PKGBUILD 208850 2014-03-27 14:43:34Z fyan $ +# $Id: PKGBUILD 209782 2014-04-04 06:05:32Z fyan $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Douglas Soares de Andrade <dsa@aur.archlinux.org> # Contributor: Angel 'angvp' Velasquez <angvp[at]archlinux.com.ve> pkgbase=python-numpy pkgname=('python2-numpy' 'python-numpy') -pkgver=1.8.0 -pkgrel=3 +pkgver=1.8.1 +pkgrel=1 pkgdesc="Scientific tools for Python" arch=('i686' 'x86_64') license=('custom') url="http://www.numpy.org/" makedepends=('lapack' 'python' 'python2' 'python-setuptools' 'python2-setuptools' 'gcc-fortran' 'python-nose' 'python2-nose') options=('staticlibs') -source=(http://downloads.sourceforge.net/numpy/numpy-${pkgver}.tar.gz - numpy-insecure-mktemp-use.patch) -md5sums=('2a4b0423a758706d592abb6721ec8dcd' - '2caf84740b54dcb5fa1d47e72201f294') +source=(http://downloads.sourceforge.net/numpy/numpy-${pkgver}.tar.gz) +md5sums=('be95babe263bfa3428363d6db5b64678') prepare() { - cd numpy-$pkgver - patch -Np1 -i ../numpy-insecure-mktemp-use.patch - cd .. - cp -a numpy-$pkgver numpy-py2-$pkgver cd numpy-py2-$pkgver diff --git a/extra/python-numpy/numpy-insecure-mktemp-use.patch b/extra/python-numpy/numpy-insecure-mktemp-use.patch deleted file mode 100644 index 8ecdcedfa..000000000 --- a/extra/python-numpy/numpy-insecure-mktemp-use.patch +++ /dev/null @@ -1,263 +0,0 @@ ---- a/numpy/lib/tests/test_io.py 2013-10-30 19:32:51.000000000 +0100 -+++ b/numpy/lib/tests/test_io.py 2014-02-10 08:30:12.903607138 +0100 -@@ -4,7 +4,9 @@ - import gzip - import os - import threading --from tempfile import mkstemp, mktemp, NamedTemporaryFile -+import shutil -+import contextlib -+from tempfile import mkstemp, mkdtemp, NamedTemporaryFile - import time - import warnings - import gc -@@ -21,6 +23,12 @@ - assert_raises, run_module_suite) - from numpy.testing import assert_warns, assert_, build_err_msg - -+@contextlib.contextmanager -+def tempdir(change_dir=False): -+ tmpdir = mkdtemp() -+ yield tmpdir -+ shutil.rmtree(tmpdir) -+ - - class TextIO(BytesIO): - """Helper IO class. -@@ -145,14 +153,14 @@ - @np.testing.dec.slow - def test_big_arrays(self): - L = (1 << 31) + 100000 -- tmp = mktemp(suffix='.npz') - a = np.empty(L, dtype=np.uint8) -- np.savez(tmp, a=a) -- del a -- npfile = np.load(tmp) -- a = npfile['a'] -- npfile.close() -- os.remove(tmp) -+ with tempdir() as tmpdir: -+ tmp = open(os.path.join(tmpdir, "file.npz"), "w") -+ np.savez(tmp, a=a) -+ del a -+ npfile = np.load(tmp) -+ a = npfile['a'] -+ npfile.close() - - def test_multiple_arrays(self): - a = np.array([[1, 2], [3, 4]], float) -commit 0bb46c1448b0d3f5453d5182a17ea7ac5854ee15 -Author: Julian Taylor <jtaylor.debian@googlemail.com> -Date: Wed Feb 5 23:01:47 2014 +0100 - - ENH: remove insecure mktemp use - - mktemp only returns a filename, a malicous user could replace it before - it gets used. - -diff --git a/numpy/core/tests/test_memmap.py b/numpy/core/tests/test_memmap.py -index 6de6319..10e7a08 100644 ---- a/numpy/core/tests/test_memmap.py -+++ b/numpy/core/tests/test_memmap.py -@@ -1,7 +1,7 @@ - from __future__ import division, absolute_import, print_function - - import sys --from tempfile import NamedTemporaryFile, TemporaryFile, mktemp -+from tempfile import NamedTemporaryFile, TemporaryFile - import os - - from numpy import memmap -@@ -33,12 +33,11 @@ class TestMemmap(TestCase): - assert_array_equal(self.data, newfp) - - def test_open_with_filename(self): -- tmpname = mktemp('', 'mmap') -- fp = memmap(tmpname, dtype=self.dtype, mode='w+', -- shape=self.shape) -- fp[:] = self.data[:] -- del fp -- os.unlink(tmpname) -+ with NamedTemporaryFile() as tmp: -+ fp = memmap(tmp.name, dtype=self.dtype, mode='w+', -+ shape=self.shape) -+ fp[:] = self.data[:] -+ del fp - - def test_unnamed_file(self): - with TemporaryFile() as f: -@@ -55,17 +54,16 @@ class TestMemmap(TestCase): - del fp - - def test_filename(self): -- tmpname = mktemp('', 'mmap') -- fp = memmap(tmpname, dtype=self.dtype, mode='w+', -- shape=self.shape) -- abspath = os.path.abspath(tmpname) -- fp[:] = self.data[:] -- self.assertEqual(abspath, fp.filename) -- b = fp[:1] -- self.assertEqual(abspath, b.filename) -- del b -- del fp -- os.unlink(tmpname) -+ with NamedTemporaryFile() as tmp: -+ fp = memmap(tmp.name, dtype=self.dtype, mode='w+', -+ shape=self.shape) -+ abspath = os.path.abspath(tmp.name) -+ fp[:] = self.data[:] -+ self.assertEqual(abspath, fp.filename) -+ b = fp[:1] -+ self.assertEqual(abspath, b.filename) -+ del b -+ del fp - - def test_filename_fileobj(self): - fp = memmap(self.tmpfp, dtype=self.dtype, mode="w+", -diff --git a/numpy/core/tests/test_multiarray.py b/numpy/core/tests/test_multiarray.py -index c2ac009..a6f7b34 100644 ---- a/numpy/core/tests/test_multiarray.py -+++ b/numpy/core/tests/test_multiarray.py -@@ -2316,12 +2316,11 @@ class TestIO(object): - self.x = rand(shape) + rand(shape).astype(np.complex)*1j - self.x[0,:, 1] = [nan, inf, -inf, nan] - self.dtype = self.x.dtype -- self.filename = tempfile.mktemp() -+ self.file = tempfile.NamedTemporaryFile() -+ self.filename = self.file.name - - def tearDown(self): -- if os.path.isfile(self.filename): -- os.unlink(self.filename) -- #tmp_file.close() -+ self.file.close() - - def test_bool_fromstring(self): - v = np.array([True, False, True, False], dtype=np.bool_) -@@ -2349,7 +2348,6 @@ class TestIO(object): - y = np.fromfile(f, dtype=self.dtype) - f.close() - assert_array_equal(y, self.x.flat) -- os.unlink(self.filename) - - def test_roundtrip_filename(self): - self.x.tofile(self.filename) -@@ -2535,7 +2529,6 @@ class TestIO(object): - s = f.read() - f.close() - assert_equal(s, '1.51,2.0,3.51,4.0') -- os.unlink(self.filename) - - def test_tofile_format(self): - x = np.array([1.51, 2, 3.51, 4], dtype=float) -diff --git a/numpy/f2py/__init__.py b/numpy/f2py/__init__.py -index ccdbd4e..fcfd185 100644 ---- a/numpy/f2py/__init__.py -+++ b/numpy/f2py/__init__.py -@@ -28,20 +28,20 @@ def compile(source, - from numpy.distutils.exec_command import exec_command - import tempfile - if source_fn is None: -- fname = os.path.join(tempfile.mktemp()+'.f') -+ f = tempfile.NamedTemporaryFile(suffix='.f') - else: -- fname = source_fn -- -- f = open(fname, 'w') -- f.write(source) -- f.close() -- -- args = ' -c -m %s %s %s'%(modulename, fname, extra_args) -- c = '%s -c "import numpy.f2py as f2py2e;f2py2e.main()" %s' %(sys.executable, args) -- s, o = exec_command(c) -- if source_fn is None: -- try: os.remove(fname) -- except OSError: pass -+ f = open(source_fn, 'w') -+ -+ try: -+ f.write(source) -+ f.flush() -+ -+ args = ' -c -m %s %s %s'%(modulename, f.name, extra_args) -+ c = '%s -c "import numpy.f2py as f2py2e;f2py2e.main()" %s' % \ -+ (sys.executable, args) -+ s, o = exec_command(c) -+ finally: -+ f.close() - return s - - from numpy.testing import Tester -diff --git a/numpy/f2py/f2py2e.py b/numpy/f2py/f2py2e.py -index ff9d19e..25407d4 100755 ---- a/numpy/f2py/f2py2e.py -+++ b/numpy/f2py/f2py2e.py -@@ -91,7 +91,7 @@ Options: - --lower is assumed with -h key, and --no-lower without -h key. - - --build-dir <dirname> All f2py generated files are created in <dirname>. -- Default is tempfile.mktemp(). -+ Default is tempfile.mkdtemp(). - - --overwrite-signature Overwrite existing signature file. - -@@ -424,7 +424,7 @@ def run_compile(): - del sys.argv[i] - else: - remove_build_dir = 1 -- build_dir = os.path.join(tempfile.mktemp()) -+ build_dir = tempfile.mkdtemp() - - _reg1 = re.compile(r'[-][-]link[-]') - sysinfo_flags = [_m for _m in sys.argv[1:] if _reg1.match(_m)] -commit 524b9eaa33ec67e34eb31a208e02bb934f778096 -Author: Julian Taylor <jtaylor.debian@googlemail.com> -Date: Sat Feb 8 11:55:36 2014 +0100 - - TST: fix test_io.TestSavezLoad - -diff --git a/numpy/lib/tests/test_io.py b/numpy/lib/tests/test_io.py -index 2ee5c83..8995fad 100644 ---- a/numpy/lib/tests/test_io.py -+++ b/numpy/lib/tests/test_io.py -@@ -187,7 +187,7 @@ class TestSavezLoad(RoundtripTest, TestCase): - L = (1 << 31) + 100000 - a = np.empty(L, dtype=np.uint8) - with tempdir() as tmpdir: -- tmp = open(os.path.join(tmpdir, "file.npz"), "w") -+ tmp = os.path.join(tmpdir, "file.npz") - np.savez(tmp, a=a) - del a - npfile = np.load(tmp) -commit 8296aa0b911c036c984e23665ee0f7ddca579b91 -Author: Julian Taylor <jtaylor.debian@googlemail.com> -Date: Sat Feb 8 13:40:26 2014 +0100 - - TST: clean up tempfile in test_closing_zipfile_after_load - -diff --git a/numpy/lib/tests/test_io.py b/numpy/lib/tests/test_io.py -index 2ee5c83..6aae3d2 100644 ---- a/numpy/lib/tests/test_io.py -+++ b/numpy/lib/tests/test_io.py -@@ -295,13 +295,14 @@ class TestSavezLoad(RoundtripTest, TestCase): - # Check that zipfile owns file and can close it. - # This needs to pass a file name to load for the - # test. -- fd, tmp = mkstemp(suffix='.npz') -- os.close(fd) -- np.savez(tmp, lab='place holder') -- data = np.load(tmp) -- fp = data.zip.fp -- data.close() -- assert_(fp.closed) -+ with tempdir() as tmpdir: -+ fd, tmp = mkstemp(suffix='.npz', dir=tmpdir) -+ os.close(fd) -+ np.savez(tmp, lab='place holder') -+ data = np.load(tmp) -+ fp = data.zip.fp -+ data.close() -+ assert_(fp.closed) - - - class TestSaveTxt(TestCase): diff --git a/extra/python-zope-interface/PKGBUILD b/extra/python-zope-interface/PKGBUILD index f8afc152b..e218b19d3 100644 --- a/extra/python-zope-interface/PKGBUILD +++ b/extra/python-zope-interface/PKGBUILD @@ -1,18 +1,18 @@ -# $Id: PKGBUILD 208860 2014-03-27 14:43:41Z fyan $ +# $Id: PKGBUILD 209780 2014-04-04 05:24:27Z fyan $ # Maintainer : Felix Yan <felixonmars@gmail.com> # Contributor: Ionut Biru <ibiru@archlinux.org> # Contributor: Douglas Soares de Andrade <douglas@archlinux.org> pkgbase=python-zope-interface pkgname=('python-zope-interface' 'python2-zope-interface') -pkgver=4.1.0 -pkgrel=2 +pkgver=4.1.1 +pkgrel=1 license=('ZPL') arch=('i686' 'x86_64') url="http://pypi.python.org/pypi/zope.interface" makedepends=('python-setuptools' 'python2-setuptools') source=("http://pypi.python.org/packages/source/z/zope.interface/zope.interface-${pkgver}.tar.gz") -md5sums=('ac63de1784ea0327db876c908af07a94') +md5sums=('edcd5f719c5eb2e18894c4d06e29b6c6') prepare() { cp -a zope.interface-${pkgver}{,-python2} @@ -37,18 +37,20 @@ check() { } package_python-zope-interface() { - pkgdesc=('Zope Interfaces for Python3') + pkgdesc=('Zope Interfaces for Python 3.x') depends=('python') + cd "${srcdir}/zope.interface-${pkgver}" python setup.py install --prefix=/usr --root="${pkgdir}" --optimize=1 cp src/zope/__init__.py "${pkgdir}/usr/lib/python3.4/site-packages/zope/" } package_python2-zope-interface(){ - pkgdesc=('Zope Interfaces for Python2') + pkgdesc=('Zope Interfaces for Python 2.x') depends=('python2') replaces=('zope-interface') provides=('zope-interface') + cd "${srcdir}/zope.interface-${pkgver}-python2" python2 setup.py install --prefix=/usr --root="${pkgdir}" --optimize=1 cp src/zope/__init__.py "${pkgdir}/usr/lib/python2.7/site-packages/zope/" diff --git a/extra/sqlite/PKGBUILD b/extra/sqlite/PKGBUILD index 5696b0f8d..d27620468 100644 --- a/extra/sqlite/PKGBUILD +++ b/extra/sqlite/PKGBUILD @@ -1,13 +1,13 @@ -# $Id: PKGBUILD 208876 2014-03-27 19:59:45Z andyrtr $ +# $Id: PKGBUILD 209788 2014-04-04 08:57:39Z andyrtr $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> # Contributor: Tom Newsom <Jeepster@gmx.co.uk> pkgbase="sqlite" pkgname=('sqlite' 'sqlite-tcl' 'sqlite-doc') -_amalgamationver=3080402 +_amalgamationver=3080403 _docver=${_amalgamationver} #_docver=3080001 -pkgver=3.8.4.2 +pkgver=3.8.4.3 pkgrel=1 pkgdesc="A C library that implements an SQL database engine" arch=('i686' 'x86_64') @@ -19,8 +19,8 @@ source=( # tarball containing the amalgamation for SQLite >= 3.7.5 together with http://www.sqlite.org/2014/sqlite-doc-${_docver}.zip license.txt) options=('!emptydirs') -sha1sums=('97d727b46ca67c98eb7a0fa3f57a1cfeb7f08f74' - '3f615f9fa81b737e652b06eddef8307235d84f2c' +sha1sums=('70f3b100fa22e5bfebfe1b0a2102612e3c6c53fb' + 'ce8615799a9da7fc9d2cbcd2774d77da4ba72417' 'f34f6daa4ab3073d74e774aad21d66878cf26853') build() { diff --git a/extra/xorg-xauth/PKGBUILD b/extra/xorg-xauth/PKGBUILD index 558a17b99..11fb17970 100644 --- a/extra/xorg-xauth/PKGBUILD +++ b/extra/xorg-xauth/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 196360 2013-10-12 08:39:11Z andyrtr $ +# $Id: PKGBUILD 209801 2014-04-04 13:05:53Z andyrtr $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=xorg-xauth -pkgver=1.0.8 +pkgver=1.0.9 pkgrel=1 pkgdesc="X.Org authorization settings program" arch=(i686 x86_64) @@ -13,16 +13,16 @@ depends=('libxmu') makedepends=('xorg-util-macros') groups=('xorg-apps' 'xorg') source=(${url}/releases/individual/app/xauth-${pkgver}.tar.bz2) -sha256sums=('a8696ae7a50c699d5fb3a41408b60d98843d19ea46e9f09e391cb98c8f7fd4f7') +sha256sums=('56ce1523eb48b1f8a4f4244fe1c3d8e6af1a3b7d4b0e6063582421b0b68dc28f') build() { - cd "${srcdir}/xauth-${pkgver}" + cd xauth-${pkgver} ./configure --prefix=/usr make } package() { - cd "${srcdir}/xauth-${pkgver}" + cd xauth-${pkgver} make DESTDIR="${pkgdir}" install install -d -m755 "${pkgdir}/usr/share/licenses/${pkgname}" install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" |