cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update to version 2.2.2

Browse Source 
with tweaks from dcoppa@ (maintainer)
This commit is contained in:
simon 2011-03-21 19:58:28 +00:00
parent 4d5925c311
commit 52c7985789
12 changed files with 96 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
databases/redis/Makefile
View File

@ -1,7 +1,7 @@
# $OpenBSD: Makefile,v 1.6 2011/03/16 14:19:38 dcoppa Exp $
# $OpenBSD: Makefile,v 1.7 2011/03/21 19:58:28 simon Exp $
COMMENT = persistent key-value database
DISTNAME = redis-2.0.5
DISTNAME = redis-2.2.2
CATEGORIES = databases
HOMEPAGE = http://redis.io/

10
databases/redis/distinfo
View File

@ -1,5 +1,5 @@
MD5 (redis-2.0.5.tar.gz) = D17jkRNVymxrCV2Hnc/hkQ==
RMD160 (redis-2.0.5.tar.gz) = tZjnPl2CKP40mpwFcGdWqhLwgJA=
SHA1 (redis-2.0.5.tar.gz) = LfaF1D/fDYNuTScVgLtTY9aUIEI=
SHA256 (redis-2.0.5.tar.gz) = 7BC/FgL3wvp7AajpHA/1WjRvmKFlLN4ZnLERg3RK4MA=
SIZE (redis-2.0.5.tar.gz) = 347760
MD5 (redis-2.2.2.tar.gz) = HFsNlh2oSo+bRKMotDhUng==
RMD160 (redis-2.2.2.tar.gz) = p6IatqoH955c3rmRom3R1VRG444=
SHA1 (redis-2.2.2.tar.gz) = dblT5KMGdXBVXF8/Xo9IHEBImQQ=
SHA256 (redis-2.2.2.tar.gz) = TF/1ieyAvwGevrz1+1GHk51+UMNPqfigUR5Aglo+wjU=
SIZE (redis-2.2.2.tar.gz) = 446269

16
databases/redis/patches/patch-Makefile
View File

@ -1,16 +0,0 @@
$OpenBSD: patch-Makefile,v 1.1.1.1 2010/10/10 15:50:06 dcoppa Exp $
--- Makefile.orig Fri Oct 8 14:23:50 2010
+++ Makefile Fri Oct 8 14:24:24 2010
@@ -89,10 +89,10 @@ dep:
$(CC) -MM *.c
staticsymbols:
- tclsh utils/build-static-symbols.tcl > staticsymbols.h
+ ${TCL_BIN} utils/build-static-symbols.tcl > staticsymbols.h
test:
- tclsh8.5 tests/test_helper.tcl --tags "${TAGS}"
+ ${TCL_BIN} tests/test_helper.tcl --tags "${TAGS}"
bench:
./redis-benchmark

14
databases/redis/patches/patch-ae_c
View File

@ -1,14 +0,0 @@
$OpenBSD: patch-ae_c,v 1.1 2010/11/17 08:44:54 dcoppa Exp $
missing #include for memset(3)
--- ae.c.orig Wed Nov 17 08:38:00 2010
+++ ae.c Wed Nov 17 08:38:15 2010
@@ -35,6 +35,7 @@
#include <sys/types.h>
#include <unistd.h>
#include <stdlib.h>
+#include <string.h>
#include "ae.h"
#include "zmalloc.h"

16
databases/redis/patches/patch-redis_c
View File

@ -1,16 +0,0 @@
$OpenBSD: patch-redis_c,v 1.4 2011/03/16 14:19:38 dcoppa Exp $
Fix an alignment problem that was causing a SIGBUS on strict alignment
archs like SPARC
--- redis.c.orig Fri Mar 4 16:48:37 2011
+++ redis.c Wed Mar 16 14:04:48 2011
@@ -7459,7 +7459,7 @@ static int deleteIfVolatile(redisDb *db, robj *key) {
static void expireGenericCommand(redisClient *c, robj *key, robj *param, long offset) {
dictEntry *de;
- time_t seconds;
+ long seconds;
if (getLongFromObjectOrReply(c, param, &seconds, NULL) != REDIS_OK) return;

21
databases/redis/patches/patch-src_Makefile Normal file
View File

@ -0,0 +1,21 @@
$OpenBSD: patch-src_Makefile,v 1.1 2011/03/21 19:58:28 simon Exp $
--- src/Makefile.orig Fri Mar 4 16:31:20 2011
+++ src/Makefile Sun Mar 20 18:05:46 2011
@@ -21,7 +21,7 @@ ifeq ($(USE_TCMALLOC),yes)
endif
CCOPT= $(CFLAGS) $(CCLINK) $(ARCH) $(PROF)
-PREFIX= /usr/local
+PREFIX?= /usr/local
INSTALL_BIN= $(PREFIX)/bin
INSTALL= cp -p
@@ -142,7 +142,7 @@ dep:
$(CC) -MM *.c
test: redis-server
- (cd ..; tclsh8.5 tests/test_helper.tcl --tags "${TAGS}" --file "${FILE}")
+ (cd ..; ulimit -Sn 192; ${TCL_BIN} tests/test_helper.tcl --tags "${TAGS}" --file "${FILE}")
bench:
./redis-benchmark

11
databases/redis/patches/patch-src_ae_c Normal file
View File

@ -0,0 +1,11 @@
$OpenBSD: patch-src_ae_c,v 1.1 2011/03/21 19:58:28 simon Exp $
--- src/ae.c.orig Fri Mar 4 16:31:20 2011
+++ src/ae.c Thu Mar 10 20:29:36 2011
@@ -35,6 +35,7 @@
#include <sys/types.h>
#include <unistd.h>
#include <stdlib.h>
+#include <string.h>
#include "ae.h"
#include "zmalloc.h"

11
databases/redis/patches/patch-src_debug_c Normal file
View File

@ -0,0 +1,11 @@
$OpenBSD: patch-src_debug_c,v 1.1 2011/03/21 19:58:28 simon Exp $
--- src/debug.c.orig Thu Mar 10 20:33:48 2011
+++ src/debug.c Thu Mar 10 20:34:00 2011
@@ -1,6 +1,7 @@
#include "redis.h"
#include "sha1.h" /* SHA1 is used for DEBUG DIGEST */
+#include <netinet/in.h>
#include <arpa/inet.h>
/* ================================= Debugging ============================== */

11
databases/redis/patches/patch-src_rdb_c Normal file
View File

@ -0,0 +1,11 @@
$OpenBSD: patch-src_rdb_c,v 1.1 2011/03/21 19:58:28 simon Exp $
--- src/rdb.c.orig Thu Mar 10 20:33:22 2011
+++ src/rdb.c Thu Mar 10 20:33:31 2011
@@ -6,6 +6,7 @@
#include <sys/time.h>
#include <sys/resource.h>
#include <sys/wait.h>
+#include <netinet/in.h>
#include <arpa/inet.h>
#include <sys/stat.h>

11
databases/redis/patches/patch-src_redis-check-dump_c Normal file
View File

@ -0,0 +1,11 @@
$OpenBSD: patch-src_redis-check-dump_c,v 1.1 2011/03/21 19:58:28 simon Exp $
--- src/redis-check-dump.c.orig Thu Mar 10 20:31:57 2011
+++ src/redis-check-dump.c Thu Mar 10 20:32:09 2011
@@ -5,6 +5,7 @@
#include <sys/stat.h>
#include <sys/mman.h>
#include <string.h>
+#include <netinet/in.h>
#include <arpa/inet.h>
#include <stdint.h>
#include <limits.h>

11
databases/redis/patches/patch-src_redis_c Normal file
View File

@ -0,0 +1,11 @@
$OpenBSD: patch-src_redis_c,v 1.1 2011/03/21 19:58:28 simon Exp $
--- src/redis.c.orig Thu Mar 10 20:32:37 2011
+++ src/redis.c Thu Mar 10 20:32:47 2011
@@ -41,6 +41,7 @@
#include <assert.h>
#include <ctype.h>
#include <stdarg.h>
+#include <netinet/in.h>
#include <arpa/inet.h>
#include <sys/stat.h>
#include <fcntl.h>

14
databases/redis/pkg/PLIST
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.2 2011/03/16 14:19:38 dcoppa Exp $
@comment $OpenBSD: PLIST,v 1.3 2011/03/21 19:58:28 simon Exp $
@bin bin/redis-benchmark
@bin bin/redis-check-aof
@bin bin/redis-check-dump
@ -12,6 +12,7 @@ share/doc/redis/Benchmarks.html
share/doc/redis/BgrewriteaofCommand.html
share/doc/redis/BgsaveCommand.html
share/doc/redis/BlpopCommand.html
share/doc/redis/BrpoplpushCommand.html
share/doc/redis/CommandReference.html
share/doc/redis/Comparisons.html
share/doc/redis/ConfigCommand.html
@ -32,6 +33,7 @@ share/doc/redis/FlushdbCommand.html
share/doc/redis/FromSqlToDataStructures.html
share/doc/redis/GenericCommandsSidebar.html
share/doc/redis/GetCommand.html
share/doc/redis/GetbitCommand.html
share/doc/redis/GetsetCommand.html
share/doc/redis/HackingStrings.html
share/doc/redis/HashCommandsSidebar.html
@ -42,6 +44,7 @@ share/doc/redis/HgetCommand.html
share/doc/redis/HgetallCommand.html
share/doc/redis/HincrbyCommand.html
share/doc/redis/HlenCommand.html
share/doc/redis/HmgetCommand.html
share/doc/redis/HmsetCommand.html
share/doc/redis/HsetCommand.html
share/doc/redis/HsetnxCommand.html
@ -64,6 +67,7 @@ share/doc/redis/MonitorCommand.html
share/doc/redis/MoveCommand.html
share/doc/redis/MsetCommand.html
share/doc/redis/MultiExecCommand.html
share/doc/redis/NonexistentCommands.html
share/doc/redis/ObjectHashMappers.html
share/doc/redis/Pipelining.html
share/doc/redis/ProgrammingExamples.html
@ -76,10 +80,15 @@ share/doc/redis/RandomkeyCommand.html
share/doc/redis/Redis0100ChangeLog.html
share/doc/redis/Redis0900ChangeLog.html
share/doc/redis/RedisBigData.html
share/doc/redis/RedisCLI.html
share/doc/redis/RedisEventLibrary.html
share/doc/redis/RedisGuides.html
share/doc/redis/RedisInternals.html
share/doc/redis/RedisPipelining.html
share/doc/redis/RedisStatus.html
share/doc/redis/Redis_1_2_0_Changelog.html
share/doc/redis/Redis_2_0_0_Changelog.html
share/doc/redis/Redis_2_0_Whats_new.html
share/doc/redis/RenameCommand.html
share/doc/redis/RenamenxCommand.html
share/doc/redis/ReplicationHowto.html
@ -95,8 +104,10 @@ share/doc/redis/SdiffstoreCommand.html
share/doc/redis/SelectCommand.html
share/doc/redis/SetCommand.html
share/doc/redis/SetCommandsSidebar.html
share/doc/redis/SetbitCommand.html
share/doc/redis/SetexCommand.html
share/doc/redis/SetnxCommand.html
share/doc/redis/SetrangeCommand.html
share/doc/redis/Sets.html
share/doc/redis/ShutdownCommand.html
share/doc/redis/SideBar.html
@ -116,6 +127,7 @@ share/doc/redis/SrandmemberCommand.html
share/doc/redis/SremCommand.html
share/doc/redis/StringCommandsSidebar.html
share/doc/redis/Strings.html
share/doc/redis/StrlenCommand.html
share/doc/redis/SubstrCommand.html
share/doc/redis/SunionCommand.html
share/doc/redis/SunionstoreCommand.html