diff --git a/talloc/PKGBUILD b/talloc/PKGBUILD index c09f73d79..891eeb0d0 100644 --- a/talloc/PKGBUILD +++ b/talloc/PKGBUILD @@ -1,8 +1,7 @@ -# Maintainer: Neophytos Kolokotronis # Contributions from Arch: https://www.archlinux.org/packages/extra/x86_64/talloc/ pkgname=talloc -pkgver=2.1.3 +pkgver=2.1.5 pkgrel=1 pkgdesc="A hierarchical pool based memory allocator with destructors" arch=(x86_64) @@ -11,13 +10,16 @@ url="http://talloc.samba.org/" depends=('glibc') makedepends=('python2' 'docbook-xsl') optdepends=('python2: for python bindings') -source=(http://samba.org/ftp/${pkgname}/${pkgname}-${pkgver}.tar.{gz,asc}) -sha1sums=('75f6a09a7199d0d952ebde6fc605dc0f2046b41c' - 'SKIP') +source=(http://samba.org/ftp/${pkgname}/${pkgname}-${pkgver}.tar.{gz,asc} + fix_test_path.patch) +sha1sums=('bdf3b3d8449e2c354f1ebc43d3e1058160eb4adb' + 'SKIP' + '34132be289f9ce1c38c8b367def8d91ac7dbb706') validpgpkeys=(9147A339719518EE9011BCB54793916113084025) # samba-bugs@samba.org prepare() { cd "${srcdir}/${pkgname}-${pkgver}" + patch -p1 < ../fix_test_path.patch sed -i -e 's#python#python2#g' buildtools/bin/waf } diff --git a/talloc/fix_test_path.patch b/talloc/fix_test_path.patch new file mode 100644 index 000000000..37ed60425 --- /dev/null +++ b/talloc/fix_test_path.patch @@ -0,0 +1,13 @@ +diff --git a/wscript b/wscript +index 9cedbbf..4432a9a 100644 +--- a/wscript ++++ b/wscript +@@ -158,7 +158,7 @@ def test(ctx): + cmd = os.path.join(Utils.g_module.blddir, 'talloc_testsuite') + ret = samba_utils.RUN_COMMAND(cmd) + print("testsuite returned %d" % ret) +- magic_cmd = os.path.join(srcdir, 'lib', 'talloc', ++ magic_cmd = os.path.join(srcdir, + 'test_magic_differs.sh') + + magic_ret = samba_utils.RUN_COMMAND(magic_cmd)