[csw-devel] SF.net SVN: gar:[20757] csw/mgar/pkg/redis/trunk

[wahwah at users.sourceforge.net]

Revision: 20757
          http://gar.svn.sourceforge.net/gar/?rev=20757&view=rev
Author:   wahwah
Date:     2013-04-17 09:31:12 +0000 (Wed, 17 Apr 2013)
Log Message:
-----------
redis/trunk: Update and a new patch; tests don't pass

Modified Paths:
--------------
    csw/mgar/pkg/redis/trunk/Makefile
    csw/mgar/pkg/redis/trunk/checksums

Added Paths:
-----------
    csw/mgar/pkg/redis/trunk/files/0001-Fix-tclsh-finding.patch

Removed Paths:
-------------
    csw/mgar/pkg/redis/trunk/files/0001-backtrace-is-only-available-on-Solaris-11.patch

Modified: csw/mgar/pkg/redis/trunk/Makefile
===================================================================
--- csw/mgar/pkg/redis/trunk/Makefile	2013-04-17 09:30:09 UTC (rev 20756)
+++ csw/mgar/pkg/redis/trunk/Makefile	2013-04-17 09:31:12 UTC (rev 20757)
@@ -2,15 +2,13 @@
 # TODO (release-critical prefixed with !, non release-critical with *)
 #
 NAME = redis
-VERSION = 2.6.9
+VERSION = 2.6.12
 
 DESCRIPTION = An advanced key-value store
 
 MASTER_SITES = $(GOOGLE_MIRROR)
 DISTFILES  = $(DISTNAME).tar.gz
 
-PATCHFILES += 0001-backtrace-is-only-available-on-Solaris-11.patch
-
 PACKAGES += CSWredis
 SPKG_DESC_CSWredis = An advanced key-value store
 
@@ -19,6 +17,8 @@
 
 GARCOMPILER = GNU
 
+PATCHFILES += 0001-Fix-tclsh-finding.patch
+
 # These are set in the Makefile and are not inherited when we force our CFLAGS in
 EXTRA_CFLAGS += -std=c99 -pedantic -Wall -W -D__EXTENSIONS__ -D_XPG6
 

Modified: csw/mgar/pkg/redis/trunk/checksums
===================================================================
--- csw/mgar/pkg/redis/trunk/checksums	2013-04-17 09:30:09 UTC (rev 20756)
+++ csw/mgar/pkg/redis/trunk/checksums	2013-04-17 09:31:12 UTC (rev 20757)
@@ -1 +1 @@
-5093fb7c5f763e828c857daf260665bc  redis-2.6.9.tar.gz
+d2c87926a650e22c2491c5e4c260849c  redis-2.6.12.tar.gz

Added: csw/mgar/pkg/redis/trunk/files/0001-Fix-tclsh-finding.patch
===================================================================
--- csw/mgar/pkg/redis/trunk/files/0001-Fix-tclsh-finding.patch	                        (rev 0)
+++ csw/mgar/pkg/redis/trunk/files/0001-Fix-tclsh-finding.patch	2013-04-17 09:31:12 UTC (rev 20757)
@@ -0,0 +1,34 @@
+From 7d91804d25372860a60f5dafe57ca6fc2a311edf Mon Sep 17 00:00:00 2001
+From: Maciej Blizinski <maciej at opencsw.org>
+Date: Wed, 17 Apr 2013 11:24:45 +0200
+Subject: [PATCH] Fix tclsh finding
+
+---
+ runtest | 9 +++++++--
+ 1 file changed, 7 insertions(+), 2 deletions(-)
+
+diff --git a/runtest b/runtest
+index d8451df..0fd0f56 100755
+--- a/runtest
++++ b/runtest
+@@ -3,10 +3,15 @@ TCL_VERSIONS="8.5 8.6"
+ TCLSH=""
+ 
+ for VERSION in $TCL_VERSIONS; do
+-	TCL=`which tclsh$VERSION 2>/dev/null` && TCLSH=$TCL
++	TCL=`which tclsh$VERSION 2>/dev/null`
++  if [ -x "${TCL}" ]; then
++    # On Solaris, the 'which' command returns nonsense when the command is not
++    # found.
++    TCLSH=$TCL
++  fi
+ done
+ 
+-if [ -z $TCLSH ]
++if [ -z "$TCLSH" ]
+ then
+     echo "You need tcl 8.5 or newer in order to run the Redis test"
+     exit 1
+-- 
+1.8.1.4
+

Deleted: csw/mgar/pkg/redis/trunk/files/0001-backtrace-is-only-available-on-Solaris-11.patch
===================================================================
--- csw/mgar/pkg/redis/trunk/files/0001-backtrace-is-only-available-on-Solaris-11.patch	2013-04-17 09:30:09 UTC (rev 20756)
+++ csw/mgar/pkg/redis/trunk/files/0001-backtrace-is-only-available-on-Solaris-11.patch	2013-04-17 09:31:12 UTC (rev 20757)
@@ -1,25 +0,0 @@
-From d1163310acf3800e43c3d0cf92dfc543b1c874a8 Mon Sep 17 00:00:00 2001
-From: Dagobert Michelsen <da\xC2m at opencsw.org>
-Date: Wed, 14 Mar 2012 15:27:11 +0100
-Subject: [PATCH] backtrace() is only available on Solaris 11+
-
----
- src/config.h |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/src/config.h b/src/config.h
-index 77fed7d..1057b8b 100644
---- a/src/config.h
-+++ b/src/config.h
-@@ -25,7 +25,7 @@
- #endif
- 
- /* Test for backtrace() */
--#if defined(__APPLE__) || defined(__linux__) || defined(__sun)
-+#if defined(__APPLE__) || defined(__linux__)
- #define HAVE_BACKTRACE 1
- #endif
- 
--- 
-1.7.9
-

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.