Date: Tue, 6 Apr 2021 14:10:03 GMT From: "Sergey A. Osokin" <osa@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 03cebea45b11 - main - Remove expired databases/redis4. Message-ID: <202104061410.136EA3Dh071554@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by osa: URL: https://cgit.FreeBSD.org/ports/commit/?id=03cebea45b111dd2c72332c058565050a626f373 commit 03cebea45b111dd2c72332c058565050a626f373 Author: Sergey A. Osokin <osa@FreeBSD.org> AuthorDate: 2021-04-06 14:09:30 +0000 Commit: Sergey A. Osokin <osa@FreeBSD.org> CommitDate: 2021-04-06 14:09:56 +0000 Remove expired databases/redis4. --- MOVED | 1 + databases/redis4/Makefile | 115 --------------------- databases/redis4/distinfo | 3 - .../redis4/files/extra-patch-src-Makefile.lua | 58 ----------- .../redis4/files/extra-patch-src-Makefile.luajit | 58 ----------- databases/redis4/files/patch-deps-Makefile | 20 ---- databases/redis4/files/patch-deps-hiredis-Makefile | 41 -------- databases/redis4/files/patch-deps-hiredis-net.c | 64 ------------ .../redis4/files/patch-deps-linenoise-Makefile | 15 --- databases/redis4/files/patch-redis.conf | 38 ------- databases/redis4/files/patch-src-Makefile | 39 ------- databases/redis4/files/patch-src-config.h | 11 -- databases/redis4/files/patch-src-lua_cjson.c | 12 --- databases/redis4/files/patch-src-mkreleasehdr.sh | 11 -- databases/redis4/files/pkg-message.in | 11 -- databases/redis4/files/redis.in | 70 ------------- databases/redis4/files/sentinel.in | 42 -------- databases/redis4/pkg-descr | 19 ---- databases/redis4/pkg-plist | 12 --- 19 files changed, 1 insertion(+), 639 deletions(-) diff --git a/MOVED b/MOVED index fdc5827a212a..5be658c07dad 100644 --- a/MOVED +++ b/MOVED @@ -16198,3 +16198,4 @@ x11-toolkits/tile||2021-03-27|Has expired: The Tile widget set is part of Tk 8.5 security/apg||2021-03-28|Has expired: Abandonware. Please try security/makepasswd or security/rndpassw instead lang/Gofer||2021-03-28|Has expired: Old, unmaintained language net/libsignal|net/libsignal-protocol-c|2021-03-30|Rename to match upstream naming +databases/redis4|databases/redis|2021-03-06|Has expired: End of life, please use modern version diff --git a/databases/redis4/Makefile b/databases/redis4/Makefile deleted file mode 100644 index 83415dabc3ff..000000000000 --- a/databases/redis4/Makefile +++ /dev/null @@ -1,115 +0,0 @@ -# Created by: Sergey Skvortsov <skv@protey.ru> -# $FreeBSD$ - -PORTNAME= redis4 -PORTVERSION= 4.0.14 -PORTREVISION= 2 -CATEGORIES= databases -MASTER_SITES= https://download.redis.io/releases/ -DISTNAME= redis-${PORTVERSION} - -MAINTAINER= osa@FreeBSD.org -COMMENT= Persistent key-value database with built-in net interface - -LICENSE= BSD3CLAUSE -LICENSE_FILE= ${WRKSRC}/COPYING - -DEPRECATED= EOLed upstream -EXPIRATION_DATE=2021-03-31 - -OPTIONS_DEFINE= TESTS TRIB -OPTIONS_RADIO= EXTLUA -OPTIONS_RADIO_EXTLUA= LUA LUAJIT -OPTIONS_SUB= yes -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.) - -.include <bsd.port.options.mk> - -.if ${ARCH} == i386 && ! ${CFLAGS:M-march=*} -# Needed for __atomic_fetch_add_8 -USE_GCC= yes -CFLAGS+= -march=i586 -.endif - -.if ${PORT_OPTIONS:MTRIB} -CATEGORIES+= ruby -USE_RUBY= yes -RUN_DEPENDS= rubygem-redis>=2.2:databases/rubygem-redis -.endif - -.if ${PORT_OPTIONS:MLUA} -USES+= lua:51 -EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-src-Makefile.lua -.endif - -.if ${PORT_OPTIONS:MLUAJIT} -LIB_DEPENDS+= libluajit-5.1.so:lang/luajit -EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-src-Makefile.luajit -.endif - -.if ${PORT_OPTIONS:MLUA} || ${PORT_OPTIONS:MLUAJIT} -CFLAGS+= -fPIC -LDFLAGS+= -Wl,-E -.endif - -.if ${PORT_OPTIONS:MTESTS} -USES+= tcl:build -.endif - -LDFLAGS+= -lpthread -lm -lexecinfo - -CONFLICTS?= redis-6.* redis5-5.* redis-devel-6.* - -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 - -USERS= redis -GROUPS= redis - -REDIS_DBDIR?= /var/db/redis -REDIS_RUNDIR?= /var/run/redis -REDIS_LOGDIR?= /var/log/redis - -SUB_FILES= pkg-message -SUB_LIST+= PORTNAME=${PORTNAME} \ - REDIS_USER=${USERS} \ - REDIS_DBDIR=${REDIS_DBDIR} \ - REDIS_LOGDIR=${REDIS_LOGDIR} \ - REDIS_RUNDIR=${REDIS_RUNDIR} - -PLIST_SUB+= REDIS_USER=${USERS} \ - REDIS_GROUP=${GROUPS} \ - REDIS_LOGDIR=${REDIS_LOGDIR} \ - REDIS_DBDIR=${REDIS_DBDIR} \ - REDIS_RUNDIR=${REDIS_RUNDIR} - -.if ${PORT_OPTIONS:MLUAJIT} || ${PORT_OPTIONS:MLUA} -post-patch: - @cd ${WRKSRC}/deps/lua/src && ${CP} fpconv.* lua_* strbuf.* ${WRKSRC}/src/ -.endif - -post-build: - ${SED} ${SUB_LIST:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \ - ${WRKSRC}/redis.conf > ${WRKDIR}/redis.conf - -do-install: - ${INSTALL_PROGRAM} ${BIN_FILES:C!^!${WRKSRC}/src/!} ${STAGEDIR}${PREFIX}/bin/ -.if ${PORT_OPTIONS:MTRIB} - ${INSTALL_SCRIPT} ${WRKSRC}/src/redis-trib.rb ${STAGEDIR}${PREFIX}/bin/ -.endif - ${INSTALL_DATA} ${WRKDIR}/redis.conf ${STAGEDIR}${PREFIX}/etc/redis.conf.sample - ${INSTALL_DATA} ${WRKSRC}/sentinel.conf ${STAGEDIR}${PREFIX}/etc/sentinel.conf.sample - ${MKDIR} ${STAGEDIR}${REDIS_LOGDIR} \ - ${STAGEDIR}${REDIS_DBDIR} \ - ${STAGEDIR}${REDIS_RUNDIR} - -do-test: - @cd ${WRKSRC} && ${TCLSH} tests/test_helper.tcl - -.include <bsd.port.mk> diff --git a/databases/redis4/distinfo b/databases/redis4/distinfo deleted file mode 100644 index 521076765de6..000000000000 --- a/databases/redis4/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -TIMESTAMP = 1553045896 -SHA256 (redis-4.0.14.tar.gz) = 1e1e18420a86cfb285933123b04a82e1ebda20bfb0a289472745a087587e93a7 -SIZE (redis-4.0.14.tar.gz) = 1740967 diff --git a/databases/redis4/files/extra-patch-src-Makefile.lua b/databases/redis4/files/extra-patch-src-Makefile.lua deleted file mode 100644 index 02d59f386ffa..000000000000 --- a/databases/redis4/files/extra-patch-src-Makefile.lua +++ /dev/null @@ -1,58 +0,0 @@ ---- src/Makefile.orig 2017-08-06 10:42:53.992510000 -0400 -+++ src/Makefile 2017-08-06 10:44:57.344366000 -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') - OPTIMIZATION?=-O2 --DEPENDENCY_TARGETS=hiredis linenoise lua -+DEPENDENCY_TARGETS=hiredis linenoise - NODEPS:=clean distclean - - # Default settings -@@ -63,8 +63,8 @@ - # Override default settings if possible - -include .make-settings - --FINAL_CFLAGS=$(STD) $(WARN) $(OPT) $(DEBUG) $(CFLAGS) $(REDIS_CFLAGS) --FINAL_LDFLAGS=$(LDFLAGS) $(REDIS_LDFLAGS) $(DEBUG) -+FINAL_CFLAGS=$(STD) $(WARN) $(OPT) $(DEBUG) $(CFLAGS) -+FINAL_LDFLAGS=$(LDFLAGS) $(DEBUG) - FINAL_LIBS=-lm - - ifeq ($(uname_S),SunOS) -@@ -112,7 +112,7 @@ - endif - endif - # Include paths to dependencies --FINAL_CFLAGS+= -I../deps/hiredis -I../deps/linenoise -I../deps/lua/src -+FINAL_CFLAGS+= -I../deps/hiredis -I../deps/linenoise - - ifeq ($(MALLOC),tcmalloc) - FINAL_CFLAGS+= -DUSE_TCMALLOC -@@ -130,6 +130,9 @@ - FINAL_LIBS+= ../deps/jemalloc/lib/libjemalloc.a - endif - -+FINAL_CFLAGS+=-I${PREFIX}/include/lua51 -+FINAL_LIBS+= -L${PREFIX}/lib -llua-5.1 -+ - REDIS_CC=$(QUIET_CC)$(CC) $(FINAL_CFLAGS) - REDIS_LD=$(QUIET_LINK)$(CC) $(FINAL_LDFLAGS) - REDIS_INSTALL=$(QUIET_INSTALL)$(INSTALL) -@@ -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+=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_BENCHMARK_NAME=redis-benchmark -@@ -201,7 +205,7 @@ - - # redis-server - $(REDIS_SERVER_NAME): $(REDIS_SERVER_OBJ) -- $(REDIS_LD) -o $@ $^ ../deps/hiredis/libhiredis.a ../deps/lua/src/liblua.a $(FINAL_LIBS) -+ $(REDIS_LD) -o $@ $^ ../deps/hiredis/libhiredis.a $(FINAL_LIBS) - - # redis-sentinel - $(REDIS_SENTINEL_NAME): $(REDIS_SERVER_NAME) diff --git a/databases/redis4/files/extra-patch-src-Makefile.luajit b/databases/redis4/files/extra-patch-src-Makefile.luajit deleted file mode 100644 index 48da60aa531d..000000000000 --- a/databases/redis4/files/extra-patch-src-Makefile.luajit +++ /dev/null @@ -1,58 +0,0 @@ ---- src/Makefile.orig 2017-08-06 10:48:29.559222000 -0400 -+++ src/Makefile 2017-08-06 10:50:45.155432000 -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') - OPTIMIZATION?=-O2 --DEPENDENCY_TARGETS=hiredis linenoise lua -+DEPENDENCY_TARGETS=hiredis linenoise - NODEPS:=clean distclean - - # Default settings -@@ -63,8 +63,8 @@ - # Override default settings if possible - -include .make-settings - --FINAL_CFLAGS=$(STD) $(WARN) $(OPT) $(DEBUG) $(CFLAGS) $(REDIS_CFLAGS) --FINAL_LDFLAGS=$(LDFLAGS) $(REDIS_LDFLAGS) $(DEBUG) -+FINAL_CFLAGS=$(STD) $(WARN) $(OPT) $(DEBUG) $(CFLAGS) -+FINAL_LDFLAGS=$(LDFLAGS) $(DEBUG) - FINAL_LIBS=-lm - - ifeq ($(uname_S),SunOS) -@@ -112,7 +112,7 @@ - endif - endif - # Include paths to dependencies --FINAL_CFLAGS+= -I../deps/hiredis -I../deps/linenoise -I../deps/lua/src -+FINAL_CFLAGS+= -I../deps/hiredis -I../deps/linenoise - - ifeq ($(MALLOC),tcmalloc) - FINAL_CFLAGS+= -DUSE_TCMALLOC -@@ -130,6 +130,9 @@ - FINAL_LIBS+= ../deps/jemalloc/lib/libjemalloc.a - endif - -+FINAL_CFLAGS+=-I${PREFIX}/include/luajit-2.0 -+FINAL_LIBS+= -L${PREFIX}/lib -lluajit-5.1 -+ - REDIS_CC=$(QUIET_CC)$(CC) $(FINAL_CFLAGS) - REDIS_LD=$(QUIET_LINK)$(CC) $(FINAL_LDFLAGS) - REDIS_INSTALL=$(QUIET_INSTALL)$(INSTALL) -@@ -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+=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_BENCHMARK_NAME=redis-benchmark -@@ -201,7 +205,7 @@ - - # redis-server - $(REDIS_SERVER_NAME): $(REDIS_SERVER_OBJ) -- $(REDIS_LD) -o $@ $^ ../deps/hiredis/libhiredis.a ../deps/lua/src/liblua.a $(FINAL_LIBS) -+ $(REDIS_LD) -o $@ $^ ../deps/hiredis/libhiredis.a $(FINAL_LIBS) - - # redis-sentinel - $(REDIS_SENTINEL_NAME): $(REDIS_SERVER_NAME) diff --git a/databases/redis4/files/patch-deps-Makefile b/databases/redis4/files/patch-deps-Makefile deleted file mode 100644 index e252c929c246..000000000000 --- a/databases/redis4/files/patch-deps-Makefile +++ /dev/null @@ -1,20 +0,0 @@ ---- 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 @@ - LUA_CFLAGS= -D__C99FEATURES__=1 - endif - --LUA_CFLAGS+= -O2 -Wall -DLUA_ANSI -DENABLE_CJSON_GLOBAL -DREDIS_STATIC='' $(CFLAGS) -+LUA_CFLAGS+= -Wall -DLUA_ANSI -DENABLE_CJSON_GLOBAL -DREDIS_STATIC='' $(CFLAGS) - 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 @@ - - lua: .make-prerequisites - @printf '%b %b\n' $(MAKECOLOR)MAKE$(ENDCOLOR) $(BINCOLOR)$@$(ENDCOLOR) -- cd lua/src && $(MAKE) all CFLAGS="$(LUA_CFLAGS)" MYLDFLAGS="$(LUA_LDFLAGS)" AR="$(AR) $(ARFLAGS)" -+ cd lua/src && $(MAKE) all CC="$(CC)" CFLAGS="$(LUA_CFLAGS)" MYLDFLAGS="$(LUA_LDFLAGS)" AR="$(AR) $(ARFLAGS)" - - .PHONY: lua - diff --git a/databases/redis4/files/patch-deps-hiredis-Makefile b/databases/redis4/files/patch-deps-hiredis-Makefile deleted file mode 100644 index 705bc2fb97e0..000000000000 --- a/databases/redis4/files/patch-deps-hiredis-Makefile +++ /dev/null @@ -1,41 +0,0 @@ ---- 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 @@ - HIREDIS_SONAME=$(shell grep HIREDIS_SONAME hiredis.h | awk '{print $$3}') - - # Installation related variables and target --PREFIX?=/usr/local -+PREFIX?=${PREFIX} - INCLUDE_PATH?=include/hiredis - LIBRARY_PATH?=lib - PKGCONF_PATH?=pkgconfig -@@ -38,10 +38,10 @@ - # 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++') --OPTIMIZATION?=-O3 -+#OPTIMIZATION?=-O3 - WARNINGS=-Wall -W -Wstrict-prototypes -Wwrite-strings --DEBUG_FLAGS?= -g -ggdb --REAL_CFLAGS=$(OPTIMIZATION) -fPIC $(CFLAGS) $(WARNINGS) $(DEBUG_FLAGS) $(ARCH) -+#DEBUG_FLAGS?= -g -ggdb -+REAL_CFLAGS=$(OPTIMIZATION) -fPIC $(CFLAGS) $(WARNINGS) $(DEBUG_FLAGS) - REAL_LDFLAGS=$(LDFLAGS) $(ARCH) - - DYLIBSUFFIX=so -@@ -60,6 +60,15 @@ - DYLIB_MAKE_CMD=$(CC) -G -o $(DYLIBNAME) -h $(DYLIB_MINOR_NAME) $(LDFLAGS) - INSTALL= cp -r - endif -+ifeq ($(uname_S),FreeBSD) -+ CFLAGS?=$(CFLAGS) -+ CCLINK?=-pthread -+ LDFLAGS?=-L. -Wl,-rpath,. -+ DYLIBNAME?=libhiredis.so -+ DYLIB_MAKE_CMD?=$(CC) -o ${DYLIBNAME} ${OBJ} -+ STLIBNAME?=libhiredis.a -+ STLIB_MAKE_CMD?=ar rcs ${STLIBNAME} ${OBJ} -+endif - ifeq ($(uname_S),Darwin) - DYLIBSUFFIX=dylib - DYLIB_MINOR_NAME=$(LIBNAME).$(HIREDIS_SONAME).$(DYLIBSUFFIX) diff --git a/databases/redis4/files/patch-deps-hiredis-net.c b/databases/redis4/files/patch-deps-hiredis-net.c deleted file mode 100644 index b230b0b91e4c..000000000000 --- a/databases/redis4/files/patch-deps-hiredis-net.c +++ /dev/null @@ -1,64 +0,0 @@ ---- 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 @@ - - val = interval; - --#ifdef _OSX -+#if defined(_OSX) - if (setsockopt(fd, IPPROTO_TCP, TCP_KEEPALIVE, &val, sizeof(val)) < 0) { - __redisSetError(c,REDIS_ERR_OTHER,strerror(errno)); - return REDIS_ERR; - } --#else --#if defined(__GLIBC__) && !defined(__FreeBSD_kernel__) -+#elif defined(__GLIBC__) - val = interval; - if (setsockopt(fd, IPPROTO_TCP, TCP_KEEPIDLE, &val, sizeof(val)) < 0) { - __redisSetError(c,REDIS_ERR_OTHER,strerror(errno)); -@@ -160,6 +159,27 @@ - __redisSetError(c,REDIS_ERR_OTHER,strerror(errno)); - return REDIS_ERR; - } -+#else -+#if !defined(__sun) && defined(TCP_KEEPIDLE) && defined(TCP_KEEPINTVL) && \ -+ defined(TCP_KEEPCNT) -+ val = interval; -+ if (setsockopt(fd, IPPROTO_TCP, TCP_KEEPIDLE, &val, sizeof(val)) < 0) { -+ __redisSetError(c,REDIS_ERR_OTHER,strerror(errno)); -+ return REDIS_ERR; -+ } -+ -+ val = interval/3; -+ if (val == 0) val = 1; -+ if (setsockopt(fd, IPPROTO_TCP, TCP_KEEPINTVL, &val, sizeof(val)) < 0) { -+ __redisSetError(c,REDIS_ERR_OTHER,strerror(errno)); -+ return REDIS_ERR; -+ } -+ -+ val = 3; -+ if (setsockopt(fd, IPPROTO_TCP, TCP_KEEPCNT, &val, sizeof(val)) < 0) { -+ __redisSetError(c,REDIS_ERR_OTHER,strerror(errno)); -+ return REDIS_ERR; -+ } - #endif - #endif - -@@ -431,7 +451,7 @@ - struct sockaddr_un sa; - long timeout_msec = -1; - -- if (redisCreateSocket(c,AF_LOCAL) < 0) -+ if (redisCreateSocket(c,AF_UNIX) < 0) - return REDIS_ERR; - if (redisSetBlocking(c,0) != REDIS_OK) - return REDIS_ERR; -@@ -456,7 +476,7 @@ - if (redisContextTimeoutMsec(c,&timeout_msec) != REDIS_OK) - return REDIS_ERR; - -- sa.sun_family = AF_LOCAL; -+ sa.sun_family = AF_UNIX; - strncpy(sa.sun_path,path,sizeof(sa.sun_path)-1); - if (connect(c->fd, (struct sockaddr*)&sa, sizeof(sa)) == -1) { - if (errno == EINPROGRESS && !blocking) { diff --git a/databases/redis4/files/patch-deps-linenoise-Makefile b/databases/redis4/files/patch-deps-linenoise-Makefile deleted file mode 100644 index 8f39994aa201..000000000000 --- a/databases/redis4/files/patch-deps-linenoise-Makefile +++ /dev/null @@ -1,15 +0,0 @@ ---- deps/linenoise/Makefile.orig 2015-01-17 22:13:25.000000000 +0300 -+++ deps/linenoise/Makefile 2015-01-17 22:13:45.000000000 +0300 -@@ -1,10 +1,10 @@ - STD= - WARN= -Wall --OPT= -Os -+#OPT= -Os - - R_CFLAGS= $(STD) $(WARN) $(OPT) $(DEBUG) $(CFLAGS) - R_LDFLAGS= $(LDFLAGS) --DEBUG= -g -+#DEBUG= -g - - R_CC=$(CC) $(R_CFLAGS) - R_LD=$(CC) $(R_LDFLAGS) diff --git a/databases/redis4/files/patch-redis.conf b/databases/redis4/files/patch-redis.conf deleted file mode 100644 index 5e8d12a9e10b..000000000000 --- a/databases/redis4/files/patch-redis.conf +++ /dev/null @@ -1,38 +0,0 @@ ---- 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 @@ - - # 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. --daemonize no -+daemonize yes - - # If you run Redis from upstart or systemd, Redis can interact with your - # supervision tree. Options: -@@ -147,7 +147,7 @@ - # - # 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. --pidfile /var/run/redis_6379.pid -+pidfile %%REDIS_RUNDIR%%/redis.pid - - # Specify the server verbosity level. - # This can be one of: -@@ -160,7 +160,7 @@ - # 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 --logfile "" -+logfile %%REDIS_LOGDIR%%/redis.log - - # 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 @@ - # The Append Only File will also be created inside this directory. - # - # Note that you must specify a directory here, not a file name. --dir ./ -+dir %%REDIS_DBDIR%%/ - - ################################# REPLICATION ################################# - diff --git a/databases/redis4/files/patch-src-Makefile b/databases/redis4/files/patch-src-Makefile deleted file mode 100644 index bfbe89b2d241..000000000000 --- a/databases/redis4/files/patch-src-Makefile +++ /dev/null @@ -1,39 +0,0 @@ ---- 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 - OPT=$(OPTIMIZATION) - --PREFIX?=/usr/local -+PREFIX:=$(PREFIX) - INSTALL_BIN=$(PREFIX)/bin - INSTALL=install - -@@ -52,7 +52,6 @@ - FINAL_CFLAGS=$(STD) $(WARN) $(OPT) $(DEBUG) $(CFLAGS) $(REDIS_CFLAGS) - FINAL_LDFLAGS=$(LDFLAGS) $(REDIS_LDFLAGS) $(DEBUG) - FINAL_LIBS=-lm --DEBUG=-g -ggdb - - ifeq ($(uname_S),SunOS) - # SunOS -@@ -63,6 +62,11 @@ - ifeq ($(uname_S),Darwin) - # Darwin (nothing to do) - else -+ifeq ($(uname_S),FreeBSD) -+ # FreeBSD -+ FINAL_CFLAGS?= $(CFLAGS) $(REDIS_CFLAGS) -I${PREFIX}/include -+ FINAL_LDFLAGS= $(LDFLAGS) -pthread -+else - ifeq ($(uname_S),AIX) - # AIX - FINAL_LDFLAGS+= -Wl,-bexpall -@@ -75,6 +79,7 @@ - endif - endif - endif -+endif - # Include paths to dependencies - FINAL_CFLAGS+= -I../deps/hiredis -I../deps/linenoise -I../deps/lua/src - diff --git a/databases/redis4/files/patch-src-config.h b/databases/redis4/files/patch-src-config.h deleted file mode 100644 index 23666a862b96..000000000000 --- a/databases/redis4/files/patch-src-config.h +++ /dev/null @@ -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 - diff --git a/databases/redis4/files/patch-src-lua_cjson.c b/databases/redis4/files/patch-src-lua_cjson.c deleted file mode 100644 index e4b95cb884ff..000000000000 --- a/databases/redis4/files/patch-src-lua_cjson.c +++ /dev/null @@ -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" diff --git a/databases/redis4/files/patch-src-mkreleasehdr.sh b/databases/redis4/files/patch-src-mkreleasehdr.sh deleted file mode 100644 index 898eca80bfdb..000000000000 --- a/databases/redis4/files/patch-src-mkreleasehdr.sh +++ /dev/null @@ -1,11 +0,0 @@ ---- src/mkreleasehdr.sh.orig 2013-08-13 15:39:40.000000000 +0400 -+++ src/mkreleasehdr.sh 2013-08-13 15:39:55.000000000 +0400 -@@ -1,6 +1,6 @@ - #!/bin/sh --GIT_SHA1=`(git show-ref --head --hash=8 2> /dev/null || echo 00000000) | head -n1` --GIT_DIRTY=`git diff --no-ext-diff 2> /dev/null | wc -l` -+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) && \ diff --git a/databases/redis4/files/pkg-message.in b/databases/redis4/files/pkg-message.in deleted file mode 100644 index 85a89529262a..000000000000 --- a/databases/redis4/files/pkg-message.in +++ /dev/null @@ -1,11 +0,0 @@ -[ -{ type: install - message: <<EOM - To setup "%%PORTNAME%%" you need to edit the configuration file: - %%PREFIX%%/etc/%%PORTNAME%%.conf - - To run redis from startup, add %%PORTNAME%%_enable="YES" - in your /etc/rc.conf. -EOM -} -] diff --git a/databases/redis4/files/redis.in b/databases/redis4/files/redis.in deleted file mode 100644 index fb54f40bf2b3..000000000000 --- a/databases/redis4/files/redis.in +++ /dev/null @@ -1,70 +0,0 @@ -#!/bin/sh -# -# $FreeBSD$ -# - -# PROVIDE: redis -# REQUIRE: LOGIN -# BEFORE: securelevel -# KEYWORD: shutdown - -# Add the following line to /etc/rc.conf to enable `redis': -# -#redis_enable="YES" -# -# Define profiles here to run separate redis instances: -# -#redis_profiles="foo bar" # Script uses %%PREFIX%%/etc/redis-NAME.conf respectively. -# For correct script working please update pidfile entries in -# redis-NAME.conf files. - -. /etc/rc.subr - -name="redis" -rcvar="${name}_enable" - -extra_commands="reload" - -command="%%PREFIX%%/bin/redis-server" -pidfile="%%REDIS_RUNDIR%%/$name.pid" - -# read configuration and set defaults -load_rc_config "$name" -: ${redis_enable="NO"} -: ${redis_user="%%REDIS_USER%%"} -: ${redis_config="%%PREFIX%%/etc/$name.conf"} - -command_args="${redis_config}" -required_files="${redis_config}" - -_profile_exists() { - for _p in ${redis_profiles}; do - [ "${_p}" = "$1" ] && return 1; - done - return 0 -} - -if [ $# -eq 2 ]; then - _profile=$2 - _profile_exists $_profile - _exists=$? - [ ${_exists} -ne 1 ] && { - echo "`basename %%PREFIX%%/etc/rc.d/redis`: no '$2' in 'redis_profiles'" - exit 1 - }; - echo "-- Profile: ${_profile} --" - config_file="%%PREFIX%%/etc/${name}-${_profile}.conf" - command_args="${config_file}" - pidfile="%%REDIS_RUNDIR%%/${_profile}.pid" - required_files="${config_file}" -elif [ -n "${redis_profiles}" ]; then - _swap=$*; shift; _profiles=$* - _profiles=${_profiles:-${redis_profiles}} - set -- ${_swap} - for _profile in ${_profiles}; do - %%PREFIX%%/etc/rc.d/redis $1 ${_profile} - done - exit 0 -fi - -run_rc_command "$1" diff --git a/databases/redis4/files/sentinel.in b/databases/redis4/files/sentinel.in deleted file mode 100644 index b66ae1492b01..000000000000 --- a/databases/redis4/files/sentinel.in +++ /dev/null @@ -1,42 +0,0 @@ -#!/bin/sh -# -# $FreeBSD$ -# - -# PROVIDE: sentinel -# REQUIRE: LOGIN -# BEFORE: securelevel -# KEYWORD: shutdown - -# Add the following line to /etc/rc.conf to enable `sentinel': -# -#sentinel_enable="YES" -# - -. /etc/rc.subr - -name="sentinel" -rcvar="${name}_enable" - -command="/usr/local/bin/redis-sentinel" -pidfile="/var/run/redis/$name.pid" - -# read configuration and set defaults -load_rc_config "$name" -: ${sentinel_enable="NO"} -: ${sentinel_user="redis"} -: ${sentinel_config="/usr/local/etc/$name.conf"} - -command_args="${sentinel_config} --daemonize yes --pidfile ${pidfile}" -required_files="${sentinel_config}" -start_precmd="${name}_checks" -restart_precmd="${name}_checks" - -sentinel_checks() -{ - if [ x`id -u ${sentinel_user}` != x`stat -f %u ${sentinel_config}` ]; then - err 1 "${sentinel_config} must be owned by user ${sentinel_user}" - fi -} - -run_rc_command "$1" diff --git a/databases/redis4/pkg-descr b/databases/redis4/pkg-descr deleted file mode 100644 index 15beb1c8d992..000000000000 --- a/databases/redis4/pkg-descr +++ /dev/null @@ -1,19 +0,0 @@ -Redis is an open source, advanced key-value store. It is often referred -to as a data structure server since keys can contain strings, hashes, -lists, sets and sorted sets. - -You can run atomic operations on these types, like appending to a string; -incrementing the value in a hash; pushing to a list; computing set -intersection, union and difference; or getting the member with highest -ranking in a sorted set. - -In order to achieve its outstanding performance, Redis works with an -in-memory dataset. Depending on your use case, you can persist it either -by dumping the dataset to disk every once in a while, or by appending each -command to a log. - -Redis also supports trivial-to-setup master-slave replication, with very -fast non-blocking first synchronization, auto-reconnection on net split -and so forth. - -WWW: https://redis.io/ diff --git a/databases/redis4/pkg-plist b/databases/redis4/pkg-plist deleted file mode 100644 index 7bc055909fdd..000000000000 --- a/databases/redis4/pkg-plist +++ /dev/null @@ -1,12 +0,0 @@ -bin/redis-benchmark -bin/redis-check-aof -bin/redis-check-rdb -bin/redis-cli -bin/redis-sentinel -bin/redis-server -%%TRIB%%bin/redis-trib.rb -@sample etc/redis.conf.sample -@sample(%%REDIS_USER%%,%%REDIS_GROUP%%,) etc/sentinel.conf.sample -@dir(%%REDIS_USER%%,%%REDIS_GROUP%%,) %%REDIS_DBDIR%% -@dir(%%REDIS_USER%%,%%REDIS_GROUP%%,) %%REDIS_LOGDIR%% -@dir(%%REDIS_USER%%,%%REDIS_GROUP%%,) %%REDIS_RUNDIR%%
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202104061410.136EA3Dh071554>