improve pkgbuild, switch to a fixed source, add check()

Signed-off-by: Thore Boedecker <me@foxxx0.de>

2 files changed, 58 insertions, 21 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 701c20cf8469..34b9bfb1cb85 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,20 +1,19 @@
 # Generated by mksrcinfo v8
-# Thu Jan 26 19:35:03 UTC 2017
+# Tue May  9 20:20:17 UTC 2017
 pkgbase = php56-memcache
 	pkgdesc = Memcache module for php56
 	pkgver = 3.0.8
-	pkgrel = 3
+	pkgrel = 4
 	url = https://pecl.php.net/package/memcache
-	install = php56-memcache.install
 	arch = i686
 	arch = x86_64
 	license = PHP
 	checkdepends = memcached
 	depends = php56>=5.6.17-3
-	provides = php-memcache=3.0.8-3
+	provides = php-memcache=3.0.8-4
 	backup = etc/php56/conf.d/memcache.ini
-	source = https://pecl.php.net/get/memcache-3.0.8.tgz
-	md5sums = 24505e9b263d2c77f8ae5e9b4725e7d1
+	source = git+https://github.com/websupport-sk/pecl-memcache.git#commit=fdbd46bbc6f53ed6e024521895e142cbfc9b3340
+	sha256sums = SKIP
 
 pkgname = php56-memcache
 
diff --git a/PKGBUILD b/PKGBUILD
index f45559b00e3e..39f32a953fdf 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,10 +1,11 @@
 # Maintainer: Thore Bödecker <me [at] foxxx0 [dot] de>
+# Contributor: Evangelos Foutras <evangelos@foutrelis.com>
 
 pkgname=php56-memcache
 _pkgbase="${pkgname#php56-}"
-_phpbase="${pkgname#-memcache}"
 pkgver=3.0.8
-pkgrel=3
+pkgrel=4
+_commit=fdbd46bbc6f53ed6e024521895e142cbfc9b3340
 pkgdesc="Memcache module for php56"
 arch=('i686' 'x86_64')
 url="https://pecl.php.net/package/memcache"
@@ -14,24 +15,61 @@ depends=('php56>=5.6.17-3')
 checkdepends=('memcached')
 CFLAGS+=' -std=gnu89'
 backup=('etc/php56/conf.d/memcache.ini')
-install=php56-memcache.install
-source=(https://pecl.php.net/get/memcache-${pkgver}.tgz)
-md5sums=('24505e9b263d2c77f8ae5e9b4725e7d1')
+#source=(https://pecl.php.net/get/memcache-${pkgver}.tgz)
+source=("git+https://github.com/websupport-sk/pecl-memcache.git#commit=$_commit")
+sha256sums=('SKIP')
+
+prepare() {
+  cd "${srcdir}/pecl-memcache"
+
+  # Disable UDP tests
+  sed -i "s|^\(\$udpPort2\? =\) .*|\1 0;|" tests/connect.inc
+
+  # Remove flaky tests
+  #   [tests/040.phpt] memcache->increment()/decrement() with multiple keys
+  #   [tests/042.phpt] memcache->set() with multiple values
+  #   strange keys [tests/005.phpt]
+  #   ini_set('session.save_handler') [tests/036.phpt]
+  #   ini_set('memcache.session_redundancy') [tests/044.phpt]
+  #   ini_set('session.save_handler') with unix domain socket [tests/053.phpt]
+  #   session locking [tests/057.phpt]
+  rm tests/{005,036,040,042,044,053,057}.phpt
+}
 
 build() {
-  cd "${srcdir}/${_pkgbase}-${pkgver}"
+    cd "${srcdir}/pecl-memcache"
 
-  phpize56
-  ./configure --prefix=/usr
-  make
+    phpize56
+    ./configure \
+        --config-cache \
+        --sysconfdir=/etc/php56 \
+        --with-php-config=/usr/bin/php-config56 \
+        --localstatedir=/var
+    make
 }
 
-package() {
-  cd "${srcdir}/${_pkgbase}-${pkgver}"
+check() {
+    cd "${srcdir}/pecl-memcache"
+    sed -i "s|^\(\$domainsocket =\) .*|\1 'unix://$PWD/memcached.sock';|" \
+      tests/connect.inc
+
+    memcached_pids=()
+    memcached -p 11211 -U 11211 >/dev/null        & memcached_pids+=($!)
+    memcached -p 11212 -U 11212 >/dev/null        & memcached_pids+=($!)
+    memcached -s "$PWD/memcached.sock" >/dev/null & memcached_pids+=($!)
 
-  make INSTALL_ROOT="$pkgdir" install
-  echo ';extension=memcache.so' >memcache.ini
-  install -Dm644 memcache.ini "$pkgdir/etc/php56/conf.d/memcache.ini"
+    local ret=0
+    make test NO_INTERACTION=1 REPORT_EXIT_STATUS=1 || ret=1
+
+    kill ${memcached_pids[@]}
+
+    return $ret
 }
 
-# vim:set ts=2 sw=2 et:
+package() {
+    cd "${srcdir}/pecl-memcache"
+
+    make INSTALL_ROOT="$pkgdir" install
+    echo ';extension=memcache.so' >memcache.ini
+    install -Dm644 memcache.ini "$pkgdir/etc/php56/conf.d/memcache.ini"
+}