SF.net SVN: gar:[24973] csw/mgar/pkg/redis/trunk

dmichelsen at users.sourceforge.net dmichelsen at users.sourceforge.net
Fri May 15 15:58:44 CEST 2015


Revision: 24973
          http://sourceforge.net/p/gar/code/24973
Author:   dmichelsen
Date:     2015-05-15 13:58:44 +0000 (Fri, 15 May 2015)
Log Message:
-----------
redis/trunk: Update to 3.0.1

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

Added Paths:
-----------
    csw/mgar/pkg/redis/trunk/files/0001-Use-substitute-for-flock.patch
    csw/mgar/pkg/redis/trunk/files/cswredis.xml

Removed Paths:
-------------
    csw/mgar/pkg/redis/trunk/files/0001-Solaris-needs-lrt-for-nanosleep.patch

Modified: csw/mgar/pkg/redis/trunk/Makefile
===================================================================
--- csw/mgar/pkg/redis/trunk/Makefile	2015-05-15 12:56:47 UTC (rev 24972)
+++ csw/mgar/pkg/redis/trunk/Makefile	2015-05-15 13:58:44 UTC (rev 24973)
@@ -2,13 +2,16 @@
 # TODO (release-critical prefixed with !, non release-critical with *)
 #
 NAME = redis
-VERSION = 2.8.3
+VERSION = 3.0.1
 
 DESCRIPTION = An advanced key-value store
 
 MASTER_SITES = http://download.redis.io/releases/
 DISTFILES += $(DISTNAME).tar.gz
+DISTFILES += cswredis.xml
 
+VENDOR_URL = http://redis.io
+
 PACKAGES += CSWredis
 SPKG_DESC_CSWredis = An advanced key-value store
 
@@ -18,11 +21,11 @@
 GARCOMPILER = GNU
 
 PATCHFILES += 0001-Fix-tclsh-finding.patch
+PATCHFILES += 0001-Use-substitute-for-flock.patch
 
-PATCHFILES += 0001-Solaris-needs-lrt-for-nanosleep.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
+EXTRA_CFLAGS += -Du_int32_t=uint32_t
 
 # There is no configure
 CONFIGURE_SCRIPTS =
@@ -32,7 +35,7 @@
 TEST_TARGET = test
 
 # Some tests fail
-SKIPTEST ?= 1
+#SKIPTEST ?= 1
 
 INSTALL_OVERRIDE_VARS += PREFIX
 INSTALL_OVERRIDE_VAR_PREFIX = $(DESTDIR)$(prefix)
@@ -42,5 +45,16 @@
 # This is for tail taking -n namely gtail for us
 TEST_ENV_PATH = $(prefix)/gnu:$(PATH)
 
+PROTOTYPE_MODIFIERS += smf
+PROTOTYPE_FILES_smf += /var/opt/csw/svc/manifest/cswredis.xml
+PROTOTYPE_CLASS_smf = manifest
+
+PRESERVECONF += $(sysconfdir)/redis.conf
+
 include gar/category.mk
 
+post-install:
+	ginstall -D -m 0644 $(WORKSRC)/redis.conf $(DESTDIR)$(sysconfdir)/redis.conf
+	ginstall -D -m 0644 $(WORKDIR)/cswredis.xml $(DESTDIR)/var/opt/csw/svc/manifest/cswredis.xml
+	ginstall -d -m 0755 $(DESTDIR)/var/opt/csw/redis/data
+	@$(MAKECOOKIE)

Modified: csw/mgar/pkg/redis/trunk/checksums
===================================================================
--- csw/mgar/pkg/redis/trunk/checksums	2015-05-15 12:56:47 UTC (rev 24972)
+++ csw/mgar/pkg/redis/trunk/checksums	2015-05-15 13:58:44 UTC (rev 24973)
@@ -1 +1 @@
-6327e6786130b556b048beef0edbdfa7  redis-2.8.3.tar.gz
+dd2bf1f65d75ed518313158086d4219b  redis-3.0.1.tar.gz

Deleted: csw/mgar/pkg/redis/trunk/files/0001-Solaris-needs-lrt-for-nanosleep.patch
===================================================================
--- csw/mgar/pkg/redis/trunk/files/0001-Solaris-needs-lrt-for-nanosleep.patch	2015-05-15 12:56:47 UTC (rev 24972)
+++ csw/mgar/pkg/redis/trunk/files/0001-Solaris-needs-lrt-for-nanosleep.patch	2015-05-15 13:58:44 UTC (rev 24973)
@@ -1,25 +0,0 @@
-From 754f0d38b843f84f01d3617257f8ec1fe82cf1c7 Mon Sep 17 00:00:00 2001
-From: Dagobert Michelsen <dam at opencsw.org>
-Date: Mon, 16 Dec 2013 09:37:56 +0100
-Subject: [PATCH] Solaris needs -lrt for nanosleep
-
----
- src/Makefile | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/Makefile b/src/Makefile
-index c37549d..eadd6b7 100644
---- a/src/Makefile
-+++ b/src/Makefile
-@@ -57,7 +57,7 @@ DEBUG=-g -ggdb
- ifeq ($(uname_S),SunOS)
- 	INSTALL=cp -pf
- 	FINAL_CFLAGS+= -D__EXTENSIONS__ -D_XPG6
--	FINAL_LIBS+= -ldl -lnsl -lsocket -lpthread
-+	FINAL_LIBS+= -ldl -lnsl -lsocket -lpthread -lrt
- else ifeq ($(uname_S),Darwin)
- 	
- else
--- 
-1.8.4.1
-

Added: csw/mgar/pkg/redis/trunk/files/0001-Use-substitute-for-flock.patch
===================================================================
--- csw/mgar/pkg/redis/trunk/files/0001-Use-substitute-for-flock.patch	                        (rev 0)
+++ csw/mgar/pkg/redis/trunk/files/0001-Use-substitute-for-flock.patch	2015-05-15 13:58:44 UTC (rev 24973)
@@ -0,0 +1,31 @@
+From 2d10804706837925345730592fdda0c550494953 Mon Sep 17 00:00:00 2001
+From: Dagobert Michelsen <dam at opencsw.org>
+Date: Fri, 15 May 2015 13:20:15 +0200
+Subject: [PATCH] Use substitute for flock
+
+---
+ src/cluster.c | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+diff --git a/src/cluster.c b/src/cluster.c
+index 916a4be..17490b3 100644
+--- a/src/cluster.c
++++ b/src/cluster.c
+@@ -369,8 +369,14 @@ int clusterLockConfig(char *filename) {
+         return REDIS_ERR;
+     }
+ 
++#ifdef __sun
++    struct flock lock;
++    if (fcntl(fd, F_SETLK, &lock) == -1) {
++        if (errno == EAGAIN) {
++#else
+     if (flock(fd,LOCK_EX|LOCK_NB) == -1) {
+         if (errno == EWOULDBLOCK) {
++#endif
+             redisLog(REDIS_WARNING,
+                  "Sorry, the cluster configuration file %s is already used "
+                  "by a different Redis Cluster node. Please make sure that "
+-- 
+2.3.3
+

Added: csw/mgar/pkg/redis/trunk/files/cswredis.xml
===================================================================
(Binary files differ)

Index: csw/mgar/pkg/redis/trunk/files/cswredis.xml
===================================================================
--- csw/mgar/pkg/redis/trunk/files/cswredis.xml	2015-05-15 12:56:47 UTC (rev 24972)
+++ csw/mgar/pkg/redis/trunk/files/cswredis.xml	2015-05-15 13:58:44 UTC (rev 24973)

Property changes on: csw/mgar/pkg/redis/trunk/files/cswredis.xml
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/xml
\ No newline at end of property
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.



More information about the devel mailing list