From 885a50c4a42f0b530d4f756d34862c89f2987556 Mon Sep 17 00:00:00 2001
From: Luke Shumaker <LukeShu@sbcglobal.net>
Date: Sun, 2 Mar 2014 18:07:47 -0500
Subject: update pcr/hiredis

---
 pcr/hiredis/ChangeLog               | 10 ++++++++
 pcr/hiredis/PKGBUILD                | 46 ++++++++++++++++++++++---------------
 pcr/hiredis/hiredis-fix-tests.patch | 11 +++++++++
 3 files changed, 49 insertions(+), 18 deletions(-)
 create mode 100644 pcr/hiredis/hiredis-fix-tests.patch

(limited to 'pcr/hiredis')

diff --git a/pcr/hiredis/ChangeLog b/pcr/hiredis/ChangeLog
index fbe55643a..b804e1b67 100644
--- a/pcr/hiredis/ChangeLog
+++ b/pcr/hiredis/ChangeLog
@@ -1,3 +1,13 @@
+2013-12-11 Vladimir Tsanev <tsachev@gamil.com>
+    
+    * 0.11.0-3 :
+    Tests enabled thanks to Massimiliano Torromeo.
+
+2013-11-23 Vladimir Tsanev <tsachev@gamil.com>
+    
+    * 0.11.0-2 :
+    added i686 arch.
+
 2013-06-07 Vladimir Tsanev <tsachev@gamil.com>
     
     * 0.11.0-1 :
diff --git a/pcr/hiredis/PKGBUILD b/pcr/hiredis/PKGBUILD
index 29762e87e..a6ad20868 100644
--- a/pcr/hiredis/PKGBUILD
+++ b/pcr/hiredis/PKGBUILD
@@ -1,33 +1,43 @@
-# Maintainer: Vladimir Tsanev <tsachev@gmail.com>
+# Maintainer: orphan
+# Contributor: Nicolás Reynolds <fauno@kiwwwi.com.ar>
+# Contributor: Luke Shumaker <lukeshu@sbcglobal.net>
+# Maintainer (AUR): Vladimir Tsanev <tsachev@gmail.com>
+# Contributor (AUR): Massimiliano Torromeo <massimiliano.torromeo@gmail.com>
 
 pkgname=hiredis
 pkgver=0.11.0
-pkgrel=1
-pkgdesc='minimalistic C client library for Redis'
+pkgrel=3
+pkgdesc='Minimalistic C client library for Redis'
 arch=('x86_64' 'i686')
 url="https://github.com/redis/hiredis/"
-license=('BSD')
+license=('BSD3')
 depends=('glibc')
+checkdepends=('redis')
 changelog='ChangeLog'
-source=(https://codeload.github.com/redis/${pkgname}/tar.gz/v${pkgver})
-md5sums=('e2ac29509823ccc96990b6fe765b5d46')
+source=($pkgname-$pkgver.tar.gz::https://codeload.github.com/redis/$pkgname/tar.gz/v$pkgver
+        hiredis-fix-tests.patch)
+md5sums=('e2ac29509823ccc96990b6fe765b5d46'
+         'ddcc73042a8ec278aca6cc2b2d26bc03')
+
+prepare() {
+  cd "$srcdir/$pkgname-$pkgver"
+  patch -Np1 -i ../hiredis-fix-tests.patch
+}
 
 build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make 
+  cd "$srcdir/$pkgname-$pkgver"
+  make
 }
 
-#
-#check() {
-#  cd "${srcdir}/${pkgname}-${pkgver}"
-#  make test check c
-#}
+check() {
+  cd "$srcdir/$pkgname-$pkgver"
+  sed -r 's|echo \\|echo -e \\|' -i Makefile
+  make check
+}
 
 package() {
-  
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make PREFIX="$pkgdir/usr" clean dep install
-
-  install -Dm 644 COPYING "$pkgdir/usr/share/licenses/${pkgname}/COPYING"
+  cd "$srcdir/$pkgname-$pkgver"
+  make PREFIX="$pkgdir/usr" install
 
+  install -Dm 644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING"
 }
diff --git a/pcr/hiredis/hiredis-fix-tests.patch b/pcr/hiredis/hiredis-fix-tests.patch
new file mode 100644
index 000000000..51e49bf71
--- /dev/null
+++ b/pcr/hiredis/hiredis-fix-tests.patch
@@ -0,0 +1,11 @@
+diff -ru hiredis-0.11.0.orig/test.c hiredis-0.11.0/test.c
+--- hiredis-0.11.0.orig/test.c	2012-08-28 02:55:52.000000000 -0400
++++ hiredis-0.11.0/test.c	2014-03-02 17:49:24.396739767 -0500
+@@ -286,6 +286,7 @@
+     c = redisConnect((char*)"idontexist.local", 6379);
+     test_cond(c->err == REDIS_ERR_OTHER &&
+         (strcmp(c->errstr,"Name or service not known") == 0 ||
++	 strcmp(c->errstr,"Temporary failure in name resolution") == 0 ||
+          strcmp(c->errstr,"Can't resolve: idontexist.local") == 0));
+     redisFree(c);
+ 
-- 
cgit v1.2.3