Page MenuHomeFreeBSD
Files F163381947

D22336.id64246.diff
No OneTemporary
Actions

D22336.id64246.diff
View Options

Index: UPDATING
===================================================================
--- UPDATING
+++ UPDATING
@@ -5,6 +5,20 @@
You should get into the habit of checking this file for changes each time
you update your ports collection, before attempting any port upgrades.
+20191108:
+ AFFECTS: users of databases/redis[-devel]
+ AUTHOR: osa@FreeBSD.org
+
+ The databases/redis port has been updated to the recent stable release.
+ Users wanting to stay on v4.x can replace databases/redis with
+ databases/redis4 with one of the following commands:
+
+ # pkg install databases/redis4
+ or
+ # portmaster -o databases/redis4 databases/redis
+ or
+ # portupgrade -o databases/redis4 databases/redis
+
20191103:
AFFECTS: users of www/node
AUTHOR: bhughes@FreeBSD.org
Index: databases/Makefile
===================================================================
--- databases/Makefile
+++ databases/Makefile
@@ -890,6 +890,7 @@
SUBDIR += recutils
SUBDIR += redis
SUBDIR += redis-devel
+ SUBDIR += redis4
SUBDIR += redis_exporter
SUBDIR += redisdesktopmanager
SUBDIR += retcl
Index: databases/p5-AnyEvent-Redis/Makefile
===================================================================
--- databases/p5-AnyEvent-Redis/Makefile
+++ databases/p5-AnyEvent-Redis/Makefile
@@ -3,7 +3,7 @@
PORTNAME= AnyEvent-Redis
PORTVERSION= 0.24
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= databases perl5
MASTER_SITES= CPAN
MASTER_SITE_SUBDIR= CPAN:DGL
Index: databases/p5-Redis-Fast/Makefile
===================================================================
--- databases/p5-Redis-Fast/Makefile
+++ databases/p5-Redis-Fast/Makefile
@@ -2,6 +2,7 @@
PORTNAME= Redis-Fast
PORTVERSION= 0.23
+PORTREVISION= 1
CATEGORIES= databases perl5
MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
Index: databases/py-redis/Makefile
===================================================================
--- databases/py-redis/Makefile
+++ databases/py-redis/Makefile
@@ -3,6 +3,7 @@
PORTNAME= redis
PORTVERSION= 3.2.1
+PORTREVISION= 1
CATEGORIES= databases python
MASTER_SITES= CHEESESHOP
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
Index: databases/py-redis2/Makefile
===================================================================
--- databases/py-redis2/Makefile
+++ databases/py-redis2/Makefile
@@ -3,6 +3,7 @@
PORTNAME= redis
PORTVERSION= 2.10.6
+PORTREVISION= 1
CATEGORIES= databases python
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
PKGNAMESUFFIX= 2
Index: databases/redis-devel/Makefile
===================================================================
--- databases/redis-devel/Makefile
+++ databases/redis-devel/Makefile
@@ -64,7 +64,7 @@
LDFLAGS+= -lpthread -lm -lexecinfo
-CONFLICTS?= redis-4.*
+CONFLICTS?= redis4-4.* redis-5.*
USE_RC_SUBR= redis sentinel
BIN_FILES= redis-benchmark redis-check-aof redis-check-rdb \
Index: databases/redis/Makefile
===================================================================
--- databases/redis/Makefile
+++ databases/redis/Makefile
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= redis
-DISTVERSION= 4.0.14
-PORTREVISION= 1
+PORTVERSION= 5.0.6
CATEGORIES= databases
MASTER_SITES= http://download.redis.io/releases/
@@ -12,15 +11,19 @@
LICENSE= BSD3CLAUSE
-OPTIONS_DEFINE= TESTS TRIB
+OPTIONS_DEFINE= JEMALLOC TESTS TRIB
OPTIONS_RADIO= EXTLUA
OPTIONS_RADIO_EXTLUA= LUA LUAJIT
OPTIONS_SUB= yes
+JEMALLOC_DESC= Use jemalloc
LUA_DESC= Use lang/lua instead of builtin lua
LUAJIT_DESC= Use lang/luajit instead of builtin lua
TESTS_DESC= Install lang/tcl for redis unit tests
TRIB_DESC= Install redis-trib.rb (lang/ruby req.)
+USES+= compiler gmake
+MAKE_ENV= "V=yo"
+
.include <bsd.port.options.mk>
.if ${ARCH} == i386 && ! ${CFLAGS:M-march=*}
@@ -29,6 +32,10 @@
CFLAGS+= -march=i586
.endif
+.if ${PORT_OPTIONS:MJEMALLOC}
+MAKE_ENV+= "USE_JEMALLOC=yes"
+.endif
+
.if ${PORT_OPTIONS:MTRIB}
CATEGORIES+= ruby
USE_RUBY= yes
@@ -56,10 +63,8 @@
LDFLAGS+= -lpthread -lm -lexecinfo
-CONFLICTS?= redis-devel-5.*
+CONFLICTS?= redis4-4.* redis-devel-5.*
-USES+= gmake
-MAKE_ENV= "V=yo"
USE_RC_SUBR= redis sentinel
BIN_FILES= redis-benchmark redis-check-aof redis-check-rdb \
redis-cli redis-sentinel redis-server
@@ -84,10 +89,18 @@
REDIS_DBDIR=${REDIS_DBDIR} \
REDIS_RUNDIR=${REDIS_RUNDIR}
-.if ${PORT_OPTIONS:MLUAJIT} || ${PORT_OPTIONS:MLUA}
+.include <bsd.port.pre.mk>
+
post-patch:
+.if ${PORT_OPTIONS:MJEMALLOC}
+ @${REINPLACE_CMD} '35s!Linux!FreeBSD!g' ${WRKSRC}/src/Makefile
+.endif
+.if ${PORT_OPTIONS:MLUA} || ${PORT_OPTIONS:MLUAJIT}
@cd ${WRKSRC}/deps/lua/src && ${CP} fpconv.* lua_* strbuf.* ${WRKSRC}/src/
.endif
+.if ${CHOSEN_COMPILER_TYPE} == gcc && ${COMPILER_VERSION} <= 42
+ ${REINPLACE_CMD} -e '/pragma/d' ${WRKSRC}/src/lzf_d.c
+.endif
post-build:
${SED} ${SUB_LIST:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \
@@ -107,4 +120,4 @@
do-test:
@cd ${WRKSRC} && ${TCLSH} tests/test_helper.tcl
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
Index: databases/redis/distinfo
===================================================================
--- databases/redis/distinfo
+++ databases/redis/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1553045896
-SHA256 (redis-4.0.14.tar.gz) = 1e1e18420a86cfb285933123b04a82e1ebda20bfb0a289472745a087587e93a7
-SIZE (redis-4.0.14.tar.gz) = 1740967
+TIMESTAMP = 1572268200
+SHA256 (redis-5.0.6.tar.gz) = 6624841267e142c5d5d5be292d705f8fb6070677687c5aad1645421a936d22b3
+SIZE (redis-5.0.6.tar.gz) = 1979873
Index: databases/redis/files/extra-patch-src-Makefile.lua
===================================================================
--- databases/redis/files/extra-patch-src-Makefile.lua
+++ databases/redis/files/extra-patch-src-Makefile.lua
@@ -1,5 +1,5 @@
---- src/Makefile.orig 2017-08-06 10:42:53.992510000 -0400
-+++ src/Makefile 2017-08-06 10:44:57.344366000 -0400
+--- src/Makefile.orig 2018-10-18 18:09:43.930566000 -0400
++++ src/Makefile 2018-10-18 18:10:32.562125000 -0400
@@ -16,7 +16,7 @@
uname_S := $(shell sh -c 'uname -s 2>/dev/null || echo not')
uname_M := $(shell sh -c 'uname -m 2>/dev/null || echo not')
@@ -30,7 +30,7 @@
ifeq ($(MALLOC),tcmalloc)
FINAL_CFLAGS+= -DUSE_TCMALLOC
@@ -130,6 +130,9 @@
- FINAL_LIBS+= ../deps/jemalloc/lib/libjemalloc.a
+ FINAL_LIBS := ../deps/jemalloc/lib/libjemalloc.a $(FINAL_LIBS)
endif
+FINAL_CFLAGS+=-I${PREFIX}/include/lua51
@@ -42,10 +42,10 @@
@@ -150,6 +153,7 @@
REDIS_SERVER_NAME=redis-server
REDIS_SENTINEL_NAME=redis-sentinel
- REDIS_SERVER_OBJ=adlist.o quicklist.o ae.o anet.o dict.o server.o sds.o zmalloc.o lzf_c.o lzf_d.o pqsort.o zipmap.o sha1.o ziplist.o release.o networking.o util.o object.o db.o replication.o rdb.o t_string.o t_list.o t_set.o t_zset.o t_hash.o config.o aof.o pubsub.o multi.o debug.o sort.o intset.o syncio.o cluster.o crc16.o endianconv.o slowlog.o scripting.o bio.o rio.o rand.o memtest.o crc64.o bitops.o sentinel.o notify.o setproctitle.o blocked.o hyperloglog.o latency.o sparkline.o redis-check-rdb.o redis-check-aof.o geo.o lazyfree.o module.o evict.o expire.o geohash.o geohash_helper.o childinfo.o defrag.o siphash.o rax.o
+ REDIS_SERVER_OBJ=adlist.o quicklist.o ae.o anet.o dict.o server.o sds.o zmalloc.o lzf_c.o lzf_d.o pqsort.o zipmap.o sha1.o ziplist.o release.o networking.o util.o object.o db.o replication.o rdb.o t_string.o t_list.o t_set.o t_zset.o t_hash.o config.o aof.o pubsub.o multi.o debug.o sort.o intset.o syncio.o cluster.o crc16.o endianconv.o slowlog.o scripting.o bio.o rio.o rand.o memtest.o crc64.o bitops.o sentinel.o notify.o setproctitle.o blocked.o hyperloglog.o latency.o sparkline.o redis-check-rdb.o redis-check-aof.o geo.o lazyfree.o module.o evict.o expire.o geohash.o geohash_helper.o childinfo.o defrag.o siphash.o rax.o t_stream.o listpack.o localtime.o lolwut.o lolwut5.o
+REDIS_SERVER_OBJ+=fpconv.o lua_bit.o lua_cjson.o lua_cmsgpack.o lua_struct.o strbuf.o
REDIS_CLI_NAME=redis-cli
- REDIS_CLI_OBJ=anet.o adlist.o redis-cli.o zmalloc.o release.o anet.o ae.o crc64.o
+ REDIS_CLI_OBJ=anet.o adlist.o dict.o redis-cli.o zmalloc.o release.o anet.o ae.o crc64.o siphash.o crc16.o
REDIS_BENCHMARK_NAME=redis-benchmark
@@ -201,7 +205,7 @@
Index: databases/redis/files/extra-patch-src-Makefile.luajit
===================================================================
--- databases/redis/files/extra-patch-src-Makefile.luajit
+++ databases/redis/files/extra-patch-src-Makefile.luajit
@@ -1,5 +1,5 @@
---- src/Makefile.orig 2017-08-06 10:48:29.559222000 -0400
-+++ src/Makefile 2017-08-06 10:50:45.155432000 -0400
+--- src/Makefile.orig 2018-10-18 18:11:24.649811000 -0400
++++ src/Makefile 2018-10-18 18:11:35.160523000 -0400
@@ -16,7 +16,7 @@
uname_S := $(shell sh -c 'uname -s 2>/dev/null || echo not')
uname_M := $(shell sh -c 'uname -m 2>/dev/null || echo not')
@@ -30,7 +30,7 @@
ifeq ($(MALLOC),tcmalloc)
FINAL_CFLAGS+= -DUSE_TCMALLOC
@@ -130,6 +130,9 @@
- FINAL_LIBS+= ../deps/jemalloc/lib/libjemalloc.a
+ FINAL_LIBS := ../deps/jemalloc/lib/libjemalloc.a $(FINAL_LIBS)
endif
+FINAL_CFLAGS+=-I${PREFIX}/include/luajit-2.0
@@ -42,10 +42,10 @@
@@ -150,6 +153,7 @@
REDIS_SERVER_NAME=redis-server
REDIS_SENTINEL_NAME=redis-sentinel
- REDIS_SERVER_OBJ=adlist.o quicklist.o ae.o anet.o dict.o server.o sds.o zmalloc.o lzf_c.o lzf_d.o pqsort.o zipmap.o sha1.o ziplist.o release.o networking.o util.o object.o db.o replication.o rdb.o t_string.o t_list.o t_set.o t_zset.o t_hash.o config.o aof.o pubsub.o multi.o debug.o sort.o intset.o syncio.o cluster.o crc16.o endianconv.o slowlog.o scripting.o bio.o rio.o rand.o memtest.o crc64.o bitops.o sentinel.o notify.o setproctitle.o blocked.o hyperloglog.o latency.o sparkline.o redis-check-rdb.o redis-check-aof.o geo.o lazyfree.o module.o evict.o expire.o geohash.o geohash_helper.o childinfo.o defrag.o siphash.o rax.o
+ REDIS_SERVER_OBJ=adlist.o quicklist.o ae.o anet.o dict.o server.o sds.o zmalloc.o lzf_c.o lzf_d.o pqsort.o zipmap.o sha1.o ziplist.o release.o networking.o util.o object.o db.o replication.o rdb.o t_string.o t_list.o t_set.o t_zset.o t_hash.o config.o aof.o pubsub.o multi.o debug.o sort.o intset.o syncio.o cluster.o crc16.o endianconv.o slowlog.o scripting.o bio.o rio.o rand.o memtest.o crc64.o bitops.o sentinel.o notify.o setproctitle.o blocked.o hyperloglog.o latency.o sparkline.o redis-check-rdb.o redis-check-aof.o geo.o lazyfree.o module.o evict.o expire.o geohash.o geohash_helper.o childinfo.o defrag.o siphash.o rax.o t_stream.o listpack.o localtime.o lolwut.o lolwut5.o
+REDIS_SERVER_OBJ+=fpconv.o lua_bit.o lua_cjson.o lua_cmsgpack.o lua_struct.o strbuf.o
REDIS_CLI_NAME=redis-cli
- REDIS_CLI_OBJ=anet.o adlist.o redis-cli.o zmalloc.o release.o anet.o ae.o crc64.o
+ REDIS_CLI_OBJ=anet.o adlist.o dict.o redis-cli.o zmalloc.o release.o anet.o ae.o crc64.o siphash.o crc16.o
REDIS_BENCHMARK_NAME=redis-benchmark
@@ -201,7 +205,7 @@
Index: databases/redis/files/patch-deps-Makefile
===================================================================
--- databases/redis/files/patch-deps-Makefile
+++ databases/redis/files/patch-deps-Makefile
@@ -1,6 +1,6 @@
---- deps/Makefile.orig 2016-02-02 19:38:43.438304000 -0500
-+++ deps/Makefile 2016-02-02 19:40:05.911356000 -0500
-@@ -59,7 +59,7 @@
+--- deps/Makefile.orig 2019-09-25 10:40:18 UTC
++++ deps/Makefile
+@@ -58,7 +58,7 @@ ifeq ($(uname_S),SunOS)
LUA_CFLAGS= -D__C99FEATURES__=1
endif
@@ -9,7 +9,7 @@
LUA_LDFLAGS+= $(LDFLAGS)
# lua's Makefile defines AR="ar rcu", which is unusual, and makes it more
# challenging to cross-compile lua (and redis). These defines make it easier
-@@ -69,7 +69,7 @@
+@@ -68,7 +68,7 @@ ARFLAGS=rcu
lua: .make-prerequisites
@printf '%b %b\n' $(MAKECOLOR)MAKE$(ENDCOLOR) $(BINCOLOR)$@$(ENDCOLOR)
Index: databases/redis/files/patch-deps-hiredis-Makefile
===================================================================
--- databases/redis/files/patch-deps-hiredis-Makefile
+++ databases/redis/files/patch-deps-hiredis-Makefile
@@ -1,6 +1,6 @@
---- deps/hiredis/Makefile.orig 2017-05-01 19:46:31.733229000 -0400
-+++ deps/hiredis/Makefile 2017-05-01 19:48:37.150358000 -0400
-@@ -15,7 +15,7 @@
+--- deps/hiredis/Makefile.orig 2019-09-25 10:40:18 UTC
++++ deps/hiredis/Makefile
+@@ -15,7 +15,7 @@ HIREDIS_PATCH=$(shell grep HIREDIS_PATCH hiredis.h | a
HIREDIS_SONAME=$(shell grep HIREDIS_SONAME hiredis.h | awk '{print $$3}')
# Installation related variables and target
@@ -9,7 +9,7 @@
INCLUDE_PATH?=include/hiredis
LIBRARY_PATH?=lib
PKGCONF_PATH?=pkgconfig
-@@ -38,10 +38,10 @@
+@@ -38,10 +38,10 @@ export REDIS_TEST_CONFIG
# Fallback to gcc when $CC is not in $PATH.
CC:=$(shell sh -c 'type $(CC) >/dev/null 2>/dev/null && echo $(CC) || echo gcc')
CXX:=$(shell sh -c 'type $(CXX) >/dev/null 2>/dev/null && echo $(CXX) || echo g++')
@@ -23,10 +23,11 @@
REAL_LDFLAGS=$(LDFLAGS) $(ARCH)
DYLIBSUFFIX=so
-@@ -60,6 +60,15 @@
+@@ -59,6 +59,15 @@ ifeq ($(uname_S),SunOS)
+ REAL_LDFLAGS+= -ldl -lnsl -lsocket
DYLIB_MAKE_CMD=$(CC) -G -o $(DYLIBNAME) -h $(DYLIB_MINOR_NAME) $(LDFLAGS)
INSTALL= cp -r
- endif
++endif
+ifeq ($(uname_S),FreeBSD)
+ CFLAGS?=$(CFLAGS)
+ CCLINK?=-pthread
@@ -35,7 +36,6 @@
+ DYLIB_MAKE_CMD?=$(CC) -o ${DYLIBNAME} ${OBJ}
+ STLIBNAME?=libhiredis.a
+ STLIB_MAKE_CMD?=ar rcs ${STLIBNAME} ${OBJ}
-+endif
+ endif
ifeq ($(uname_S),Darwin)
DYLIBSUFFIX=dylib
- DYLIB_MINOR_NAME=$(LIBNAME).$(HIREDIS_SONAME).$(DYLIBSUFFIX)
Index: databases/redis/files/patch-deps-hiredis-net.c
===================================================================
--- databases/redis/files/patch-deps-hiredis-net.c
+++ databases/redis/files/patch-deps-hiredis-net.c
@@ -1,6 +1,6 @@
---- deps/hiredis/net.c.orig 2017-04-22 07:23:27.000000000 -0400
-+++ deps/hiredis/net.c 2017-05-05 20:02:09.292479000 -0400
-@@ -135,13 +135,12 @@
+--- deps/hiredis/net.c.orig 2019-09-25 10:40:18 UTC
++++ deps/hiredis/net.c
+@@ -135,13 +135,12 @@ int redisKeepAlive(redisContext *c, int interval) {
val = interval;
@@ -16,7 +16,7 @@
val = interval;
if (setsockopt(fd, IPPROTO_TCP, TCP_KEEPIDLE, &val, sizeof(val)) < 0) {
__redisSetError(c,REDIS_ERR_OTHER,strerror(errno));
-@@ -160,6 +159,27 @@
+@@ -160,6 +159,27 @@ int redisKeepAlive(redisContext *c, int interval) {
__redisSetError(c,REDIS_ERR_OTHER,strerror(errno));
return REDIS_ERR;
}
@@ -44,7 +44,7 @@
#endif
#endif
-@@ -431,7 +451,7 @@
+@@ -431,7 +451,7 @@ int redisContextConnectUnix(redisContext *c, const cha
struct sockaddr_un sa;
long timeout_msec = -1;
@@ -53,7 +53,7 @@
return REDIS_ERR;
if (redisSetBlocking(c,0) != REDIS_OK)
return REDIS_ERR;
-@@ -456,7 +476,7 @@
+@@ -456,7 +476,7 @@ int redisContextConnectUnix(redisContext *c, const cha
if (redisContextTimeoutMsec(c,&timeout_msec) != REDIS_OK)
return REDIS_ERR;
Index: databases/redis/files/patch-deps-linenoise-Makefile
===================================================================
--- databases/redis/files/patch-deps-linenoise-Makefile
+++ databases/redis/files/patch-deps-linenoise-Makefile
@@ -1,5 +1,5 @@
---- deps/linenoise/Makefile.orig 2015-01-17 22:13:25.000000000 +0300
-+++ deps/linenoise/Makefile 2015-01-17 22:13:45.000000000 +0300
+--- deps/linenoise/Makefile.orig 2019-09-25 10:40:18 UTC
++++ deps/linenoise/Makefile
@@ -1,10 +1,10 @@
STD=
WARN= -Wall
Index: databases/redis/files/patch-redis.conf
===================================================================
--- databases/redis/files/patch-redis.conf
+++ databases/redis/files/patch-redis.conf
@@ -1,6 +1,6 @@
---- redis.conf.orig 2016-06-17 09:15:21.000000000 -0400
-+++ redis.conf 2016-06-18 11:58:19.871082000 -0400
-@@ -125,7 +125,7 @@
+--- redis.conf.orig 2019-09-25 10:40:18 UTC
++++ redis.conf
+@@ -133,7 +133,7 @@ tcp-keepalive 300
# By default Redis does not run as a daemon. Use 'yes' if you need it.
# Note that Redis will write a pid file in /var/run/redis.pid when daemonized.
@@ -9,7 +9,7 @@
# If you run Redis from upstart or systemd, Redis can interact with your
# supervision tree. Options:
-@@ -147,7 +147,7 @@
+@@ -155,7 +155,7 @@ supervised no
#
# Creating a pid file is best effort: if Redis is not able to create it
# nothing bad happens, the server will start and run normally.
@@ -18,7 +18,7 @@
# Specify the server verbosity level.
# This can be one of:
-@@ -160,7 +160,7 @@
+@@ -168,7 +168,7 @@ loglevel notice
# Specify the log file name. Also the empty string can be used to force
# Redis to log on the standard output. Note that if you use standard
# output for logging but daemonize, logs will be sent to /dev/null
@@ -27,7 +27,7 @@
# To enable logging to the system logger, just set 'syslog-enabled' to yes,
# and optionally update the other syslog parameters to suit your needs.
-@@ -244,7 +244,7 @@
+@@ -260,7 +260,7 @@ dbfilename dump.rdb
# The Append Only File will also be created inside this directory.
#
# Note that you must specify a directory here, not a file name.
Index: databases/redis/files/patch-src-Makefile
===================================================================
--- databases/redis/files/patch-src-Makefile
+++ databases/redis/files/patch-src-Makefile
@@ -1,7 +1,7 @@
---- src/Makefile.orig 2015-04-01 17:01:44.000000000 +0300
-+++ src/Makefile 2015-04-07 21:30:22.464962000 +0300
-@@ -22,7 +22,7 @@
- WARN=-Wall -W
+--- src/Makefile.orig 2019-09-25 10:40:18 UTC
++++ src/Makefile
+@@ -29,7 +29,7 @@ endif
+ WARN=-Wall -W -Wno-missing-field-initializers
OPT=$(OPTIMIZATION)
-PREFIX?=/usr/local
@@ -9,7 +9,7 @@
INSTALL_BIN=$(PREFIX)/bin
INSTALL=install
-@@ -52,7 +52,6 @@
+@@ -75,7 +75,6 @@ endif
FINAL_CFLAGS=$(STD) $(WARN) $(OPT) $(DEBUG) $(CFLAGS) $(REDIS_CFLAGS)
FINAL_LDFLAGS=$(LDFLAGS) $(REDIS_LDFLAGS) $(DEBUG)
FINAL_LIBS=-lm
@@ -17,9 +17,9 @@
ifeq ($(uname_S),SunOS)
# SunOS
-@@ -63,6 +62,11 @@
- ifeq ($(uname_S),Darwin)
- # Darwin (nothing to do)
+@@ -94,6 +93,11 @@ ifeq ($(uname_S),Darwin)
+ # Darwin
+ FINAL_LIBS+= -ldl
else
+ifeq ($(uname_S),FreeBSD)
+ # FreeBSD
@@ -29,11 +29,11 @@
ifeq ($(uname_S),AIX)
# AIX
FINAL_LDFLAGS+= -Wl,-bexpall
-@@ -75,6 +79,7 @@
+@@ -120,6 +124,7 @@ else
+ # All the other OSes (notably Linux)
+ FINAL_LDFLAGS+= -rdynamic
+ FINAL_LIBS+=-ldl -pthread -lrt
++endif
endif
endif
endif
-+endif
- # Include paths to dependencies
- FINAL_CFLAGS+= -I../deps/hiredis -I../deps/linenoise -I../deps/lua/src
-
Index: databases/redis/files/patch-src-config.h
===================================================================
--- databases/redis/files/patch-src-config.h
+++ databases/redis/files/patch-src-config.h
@@ -1,11 +0,0 @@
---- src/config.h.orig 2015-04-07 21:24:36.634829000 +0300
-+++ src/config.h 2015-04-07 21:24:53.388849000 +0300
-@@ -62,7 +62,7 @@
- #endif
-
- /* Test for backtrace() */
--#if defined(__APPLE__) || (defined(__linux__) && defined(__GLIBC__))
-+#if defined(__APPLE__) || (defined(__linux__) && defined(__GLIBC__)) || defined(__FreeBSD__)
- #define HAVE_BACKTRACE 1
- #endif
-
Index: databases/redis/files/patch-src-lua_cjson.c
===================================================================
--- databases/redis/files/patch-src-lua_cjson.c
+++ databases/redis/files/patch-src-lua_cjson.c
@@ -1,12 +0,0 @@
---- deps/lua/src/lua_cjson.c.orig 2016-12-04 20:49:41.925218000 -0500
-+++ deps/lua/src/lua_cjson.c 2016-12-04 20:49:59.728885000 -0500
-@@ -46,7 +46,9 @@
- #include "strbuf.h"
- #include "fpconv.h"
-
-+#if defined(__sun)
- #include "../../../src/solarisfixes.h"
-+#endif
-
- #ifndef CJSON_MODNAME
- #define CJSON_MODNAME "cjson"
Index: databases/redis/files/patch-src-mkreleasehdr.sh
===================================================================
--- databases/redis/files/patch-src-mkreleasehdr.sh
+++ databases/redis/files/patch-src-mkreleasehdr.sh
@@ -1,5 +1,5 @@
---- src/mkreleasehdr.sh.orig 2013-08-13 15:39:40.000000000 +0400
-+++ src/mkreleasehdr.sh 2013-08-13 15:39:55.000000000 +0400
+--- src/mkreleasehdr.sh.orig 2019-09-25 10:40:18 UTC
++++ src/mkreleasehdr.sh
@@ -1,6 +1,6 @@
#!/bin/sh
-GIT_SHA1=`(git show-ref --head --hash=8 2> /dev/null || echo 00000000) | head -n1`
@@ -7,5 +7,5 @@
+GIT_SHA1="00000000"
+GIT_DIRTY="0"
BUILD_ID=`uname -n`"-"`date +%s`
- test -f release.h || touch release.h
- (cat release.h | grep SHA1 | grep $GIT_SHA1) && \
+ if [ -n "$SOURCE_DATE_EPOCH" ]; then
+ BUILD_ID=$(date -u -d "@$SOURCE_DATE_EPOCH" +%s 2>/dev/null || date -u -r "$SOURCE_DATE_EPOCH" +%s 2>/dev/null || date -u %s)
Index: databases/redis4/Makefile
===================================================================
--- databases/redis4/Makefile
+++ databases/redis4/Makefile
@@ -1,11 +1,12 @@
# Created by: Sergey Skvortsov <skv@protey.ru>
# $FreeBSD$
-PORTNAME= redis
-DISTVERSION= 4.0.14
+PORTNAME= redis4
+PORTVERSION= 4.0.14
PORTREVISION= 1
CATEGORIES= databases
MASTER_SITES= http://download.redis.io/releases/
+DISTNAME= redis-${PORTVERSION}
MAINTAINER= osa@FreeBSD.org
COMMENT= Persistent key-value database with built-in net interface
@@ -56,7 +57,7 @@
LDFLAGS+= -lpthread -lm -lexecinfo
-CONFLICTS?= redis-devel-5.*
+CONFLICTS?= redis-5.* redis-devel-5.*
USES+= gmake
MAKE_ENV= "V=yo"
Index: databases/rubygem-hiredis/Makefile
===================================================================
--- databases/rubygem-hiredis/Makefile
+++ databases/rubygem-hiredis/Makefile
@@ -3,7 +3,7 @@
PORTNAME= hiredis
PORTVERSION= 0.6.3
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= databases rubygems
MASTER_SITES= RG
Index: devel/gitblit/Makefile
===================================================================
--- devel/gitblit/Makefile
+++ devel/gitblit/Makefile
@@ -3,7 +3,7 @@
PORTNAME= gitblit
PORTVERSION= 1.8.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel java
MASTER_SITES= http://dl.bintray.com/${PORTNAME}/releases/
EXTRACT_SUFX= .war
Index: devel/py-dj22-django-rq/Makefile
===================================================================
--- devel/py-dj22-django-rq/Makefile
+++ devel/py-dj22-django-rq/Makefile
@@ -3,6 +3,7 @@
PORTNAME= django-rq
PORTVERSION= 2.1.0
+PORTREVISION= 1
CATEGORIES= devel python
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}dj22-
MASTER_SITES= CHEESESHOP
Index: devel/py-django-rq/Makefile
===================================================================
--- devel/py-django-rq/Makefile
+++ devel/py-django-rq/Makefile
@@ -21,7 +21,7 @@
${PYTHON_PKGNAMEPREFIX}docutils>=0:textproc/py-docutils@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}mock>=0:devel/py-mock@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}yaml>=0:devel/py-yaml@${PY_FLAVOR} \
- redis-server:databases/redis
+ redis-server:databases/redis4
USES= python
USE_PYTHON= autoplist concurrent distutils
Index: irc/anope/Makefile
===================================================================
--- irc/anope/Makefile
+++ irc/anope/Makefile
@@ -2,6 +2,7 @@
PORTNAME= anope
PORTVERSION= 2.0.6
+PORTREVISION= 1
CATEGORIES= irc
MAINTAINER= egypcio@FreeBSD.org
Index: net-im/rubygem-lita/Makefile
===================================================================
--- net-im/rubygem-lita/Makefile
+++ net-im/rubygem-lita/Makefile
@@ -3,7 +3,7 @@
PORTNAME= lita
PORTVERSION= 4.7.1
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= net-im rubygems
MASTER_SITES= RG
Index: net/opensips/Makefile
===================================================================
--- net/opensips/Makefile
+++ net/opensips/Makefile
@@ -3,7 +3,7 @@
PORTNAME= opensips
DISTVERSION= 2.2.6
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= net
MASTER_SITES= http://opensips.org/pub/opensips/${PORTVERSION}/
@@ -25,7 +25,7 @@
BUILD_DEPENDS= ginstall:sysutils/coreutils \
gtar:archivers/gtar \
gm4:devel/m4 \
- redis-server:databases/redis-devel
+ redis-server:databases/redis
RUN_DEPENDS= ${LOCALBASE}/bin/bash:shells/bash \
${LOCALBASE}/bin/grep:textproc/gnugrep
Index: security/openvas8-scanner/Makefile
===================================================================
--- security/openvas8-scanner/Makefile
+++ security/openvas8-scanner/Makefile
@@ -3,7 +3,7 @@
PORTNAME?= openvas8-scanner
PORTVERSION?= 5.0.8
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= security
MASTER_SITES?= http://wald.intevation.org/frs/download.php/2436/
DISTNAME= ${PORTNAME:S/${OPENVAS_VER}//}-${PORTVERSION}
Index: www/gitlab-ce/Makefile
===================================================================
--- www/gitlab-ce/Makefile
+++ www/gitlab-ce/Makefile
@@ -3,7 +3,7 @@
PORTNAME= gitlab-ce
PORTVERSION= 12.4.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= www devel
MAINTAINER= mfechner@FreeBSD.org

File Metadata

Mime Type
text/plain
Expires
Thu, Jul 23, 5:09 PM (15 h, 19 s)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
35409085
Default Alt Text
D22336.id64246.diff (24 KB)

Event Timeline