From owner-svn-ports-all@freebsd.org Sat Jan 4 23:39:27 2020 Return-Path: Delivered-To: svn-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id CF6891E374C; Sat, 4 Jan 2020 23:39:27 +0000 (UTC) (envelope-from osa@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 47qysq4wnpz4mKX; Sat, 4 Jan 2020 23:39:27 +0000 (UTC) (envelope-from osa@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 9F97A1CA31; Sat, 4 Jan 2020 23:39:27 +0000 (UTC) (envelope-from osa@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 004NdRpo083272; Sat, 4 Jan 2020 23:39:27 GMT (envelope-from osa@FreeBSD.org) Received: (from osa@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 004NdRpX083271; Sat, 4 Jan 2020 23:39:27 GMT (envelope-from osa@FreeBSD.org) Message-Id: <202001042339.004NdRpX083271@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: osa set sender to osa@FreeBSD.org using -f From: "Sergey A. Osokin" Date: Sat, 4 Jan 2020 23:39:27 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r522069 - head/databases/redis-devel X-SVN-Group: ports-head X-SVN-Commit-Author: osa X-SVN-Commit-Paths: head/databases/redis-devel X-SVN-Commit-Revision: 522069 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 04 Jan 2020 23:39:27 -0000 Author: osa Date: Sat Jan 4 23:39:27 2020 New Revision: 522069 URL: https://svnweb.freebsd.org/changeset/ports/522069 Log: Add TLS support. Convert to use modern OPTIONS way to be less discouraged with the number of knobs. (*) Bump PORTREVISION. Thanks to: adamw (*) Modified: head/databases/redis-devel/Makefile Modified: head/databases/redis-devel/Makefile ============================================================================== --- head/databases/redis-devel/Makefile Sat Jan 4 23:35:42 2020 (r522068) +++ head/databases/redis-devel/Makefile Sat Jan 4 23:39:27 2020 (r522069) @@ -3,6 +3,7 @@ PORTNAME= redis PORTVERSION= 6.0.0.20200101 +PORTREVISION= 1 CATEGORIES= databases PKGNAMESUFFIX= -devel @@ -15,7 +16,7 @@ USES+= compiler:c11 gmake USE_GITHUB= yes GH_TUPLE= antirez:${PORTNAME}:0af467d -OPTIONS_DEFINE= JEMALLOC TESTS TRIB +OPTIONS_DEFINE= JEMALLOC TESTS TLS TRIB OPTIONS_RADIO= EXTLUA OPTIONS_RADIO_EXTLUA= LUA LUAJIT LUAJITOR OPTIONS_SUB= yes @@ -23,54 +24,49 @@ JEMALLOC_DESC= Use jemalloc LUA_DESC= Use lang/lua instead of builtin lua LUAJIT_DESC= Use lang/luajit instead of builtin lua LUAJITOR_DESC= Use lang/luajit-openresty instead of builtin lua +TLS_DESC= Use TLS (openssl req.) TESTS_DESC= Install lang/tcl for redis unit tests TRIB_DESC= Install redis-trib.rb (lang/ruby req.) -MAKE_ENV= "V=yo" +MAKE_ENV= V=yo -.include +JEMALLOC_MAKE_ENV= USE_JEMALLOC=yes -.if ${ARCH} == i386 && ! ${CFLAGS:M-march=*} -# Needed for __atomic_fetch_add_8 -USE_GCC= yes -CFLAGS+= -march=i586 -.endif +LUA_USE= lua=51 +LUA_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-src-Makefile.lua +LUA_VARS= _addflags=true -.if ${PORT_OPTIONS:MJEMALLOC} -MAKE_ENV+= "USE_JEMALLOC=yes" -.endif +LUAJIT_LIB_DEPENDS= libluajit-5.1.so:lang/luajit +LUAJIT_BUILD_DEPENDS= ${LOCALBASE}/include/luajit-2.0/lua.h:lang/luajit +LUAJIT_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-src-Makefile.luajit +LUAJIT_VARS= _addflags=true -.if ${PORT_OPTIONS:MTRIB} -CATEGORIES+= ruby -USE_RUBY= yes -RUN_DEPENDS= rubygem-redis>=2.2:databases/rubygem-redis -.endif +LUAJITOR_LIB_DEPENDS= libluajit-5.1.so:lang/luajit-openresty +LUAJITOR_BUILD_DEPENDS= ${LOCALBASE}/include/luajit-2.1/lua.h:lang/luajit-openresty +LUAJITOR_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-src-Makefile.luajit-or \ + ${PATCHDIR}/extra-patch-deps_lua_src_lua__cjson.c +LUAJITOR_VARS= _addflags=true -.if ${PORT_OPTIONS:MLUA} -USES+= lua:51 -EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-src-Makefile.lua -.endif +TESTS_USES= tcl:build -.if ${PORT_OPTIONS:MLUAJIT} -LIB_DEPENDS+= libluajit-5.1.so:lang/luajit -BUILD_DEPENDS+= ${LOCALBASE}/include/luajit-2.0/lua.h:lang/luajit -EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-src-Makefile.luajit -.endif +TLS_USES= ssl +TLS_MAKE_ENV= BUILD_TLS=yes -.if ${PORT_OPTIONS:MLUAJITOR} -LIB_DEPENDS+= libluajit-5.1.so:lang/luajit-openresty -BUILD_DEPENDS+= ${LOCALBASE}/include/luajit-2.1/lua.h:lang/luajit-openresty -EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-src-Makefile.luajit-or \ - ${PATCHDIR}/extra-patch-deps_lua_src_lua__cjson.c -.endif +TRIB_CATEGORIES= ruby +TRIB_USE= ruby=yes +TRIB_RUN_DEPENDS= rubygem-redis>=2.2:databases/rubygem-redis -.if ${PORT_OPTIONS:MLUA} || ${PORT_OPTIONS:MLUAJIT} || ${PORT_OPTIONS:MLUAJITOR} -CFLAGS+= -fPIC -LDFLAGS+= -Wl,-E +.include + +.if ${ARCH} == i386 && ! ${CFLAGS:M-march=*} +# Needed for __atomic_fetch_add_8 +USE_GCC= yes +CFLAGS+= -march=i586 .endif -.if ${PORT_OPTIONS:MTESTS} -USES+= tcl:build +.if defined(_addflags) +CFLAGS= -fPIC +LDFLAGS= -Wl,-E .endif LDFLAGS+= -lpthread -lm -lexecinfo @@ -101,30 +97,30 @@ PLIST_SUB+= REDIS_USER=${USERS} \ REDIS_DBDIR=${REDIS_DBDIR} \ REDIS_RUNDIR=${REDIS_RUNDIR} -.include - -post-patch: -.if ${PORT_OPTIONS:MJEMALLOC} +post-patch-JEMALLOC-on: @${REINPLACE_CMD} '35s!Linux!FreeBSD!g' ${WRKSRC}/src/Makefile -.endif -.if ${PORT_OPTIONS:MLUA} || ${PORT_OPTIONS:MLUAJIT} || ${PORT_OPTIONS:MLUAJITOR} + +copy-lua-files: @cd ${WRKSRC}/deps/lua/src && ${CP} fpconv.* lua_* strbuf.* ${WRKSRC}/src/ -.endif +post-patch-LUA-on: copy-lua-files +post-patch-LUAJIT-on: copy-lua-files +post-patch-LUAJITOR-on: copy-lua-files + 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-install-TRIB-on: + ${INSTALL_SCRIPT} ${WRKSRC}/src/redis-trib.rb ${STAGEDIR}${PREFIX}/bin/ do-test: @cd ${WRKSRC} && ${TCLSH} tests/test_helper.tcl