From nobody Thu Apr 28 02:21:26 2022 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 3A0F01AADD8A; Thu, 28 Apr 2022 02:21:27 +0000 (UTC) (envelope-from git@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4KpfWB4bFPz3GBq; Thu, 28 Apr 2022 02:21:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1651112486; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=hUR0w0VI3qab1fqED2C6s7bt6FxgiTIZX/yuLr+WBm4=; b=r2vFjDL30r58G01LvaOkYuub0WvG3sWNXUX2Y8n3U1Otpu0BOqgNzYZobC1KdRNU5UlZVW r9sByFLjEZ6koIKtInlv+t2RymuhIifxyGQV7DIiKj2quiQSwxTQ+eqsNdfcaLiYfs0pjC rcXr//PoDSwqdN5HUSbQD9z9HAMIpLWMM4Os8/CEMJUqC6eWI8NZgr0K2c3ISDc5tYBO58 k6tT8FQcTpP7WJ4NbsJ1BwlAvikQnD+DQmBDJCuUtQSlCEnTMU/aXNNCcboDTx+xduymo5 Qa0iB42H4L6jbFywQoZ0LccVq7yGCfJAWE0Esp7+tCdEA3TVgFrPNx8bHT50cQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 6E41E7F01; Thu, 28 Apr 2022 02:21:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 23S2LQ2h012264; Thu, 28 Apr 2022 02:21:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 23S2LQFN012263; Thu, 28 Apr 2022 02:21:26 GMT (envelope-from git) Date: Thu, 28 Apr 2022 02:21:26 GMT Message-Id: <202204280221.23S2LQFN012263@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Yasuhiro Kimura Subject: git: 06391ed84e0a - main - databases/redis62: Update to 6.2.7 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: yasu X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 06391ed84e0a4b2733b678b8db5f210a0c8c4c76 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1651112486; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=hUR0w0VI3qab1fqED2C6s7bt6FxgiTIZX/yuLr+WBm4=; b=vndK2wskTN0dl+R5WFhE0e4OyPq4OFjZpvAoGMo7NKkYH3kzgeCiMFcYCtpVgcotiCEsva Bu6GwC5s5RAa/ZbG/69Hp+cV2lBOBtFRdsXu15DX+kMSvM+USm94pa4yqsv7n+66OGvFFF bC8Zyfu4JcTiVeab0V5954QYLBgjrlodTN8wBWiyfcz0958aPkTDMUgeA7Dg4sDTM3e2HP I1xMOw8TxstqCuhmLQ4xyTi0wNniX/wVdtKnbQQCYF3f5bRoT2XH5ip3Ug4Oka+ezKpR6G V61fxe4rFNO3Kcyp5vMX4a6OwSVtBQvMD1dGkEftzqEKWQ1WXpbo6Nqilh73XQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1651112486; a=rsa-sha256; cv=none; b=lDZoGAVqSAkE5exjMDmWwwoZsmikF511KSibSt9afzXa/DPx0fabLEGcGNGSZ/Sd/qMYDi 0bkDD7maZsIRU9HMLyKo+aVtmyYXjA/gmUHMBgAVjK3Oypwcwkh89mlUvn9z7e4HxogtE9 +PWkECoOHtS0AI8GuoKN5+6rE3OrkjeF/+QWW4hBAHyTiaTrOCLl/q9Xd407EcTinW//9U yY+DsVvawhGnmioKMTXuMcOttmqyIULEhavtfmY8XaWoNA3ehgNuB12GxIfp6eCsNHjUBc blHGfYPh6gPNMrevhazBtDsMcuipgPglnehX5kqTrbFlOwVxjYPHEouMejROng== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by yasu: URL: https://cgit.FreeBSD.org/ports/commit/?id=06391ed84e0a4b2733b678b8db5f210a0c8c4c76 commit 06391ed84e0a4b2733b678b8db5f210a0c8c4c76 Author: Yasuhiro Kimura AuthorDate: 2022-04-27 19:58:11 +0000 Commit: Yasuhiro Kimura CommitDate: 2022-04-28 02:18:50 +0000 databases/redis62: Update to 6.2.7 * Mark BROKEN if any of external lua library options are enabled. Upstream add new APIs to bundled lua library and use them in source code of redis. This makes it impossible to compile and link redis with external lua libraries. According to the commit message of upstream repository they took the code of new API from the repository of lua. It means linking with external lua libraries may get possible again if they are updated. So mark BROKEN rather than remove these options. * Switch to DISTVERSION. * Pet portlint and portclippy. * Tidy up Makefile with portfmt. ChangeLog: https://github.com/redis/redis/releases/tag/6.2.7 Security: cc42db1c-c65f-11ec-ad96-0800270512f4 --- databases/redis62/Makefile | 94 +++++++++++++++++++++++----------------------- databases/redis62/distinfo | 6 +-- 2 files changed, 49 insertions(+), 51 deletions(-) diff --git a/databases/redis62/Makefile b/databases/redis62/Makefile index 3ee3bcd3f74c..02a557f6f197 100644 --- a/databases/redis62/Makefile +++ b/databases/redis62/Makefile @@ -1,7 +1,7 @@ # Created by: Sergey Skvortsov PORTNAME= redis62 -PORTVERSION= 6.2.6 +DISTVERSION= 6.2.7 CATEGORIES= databases MASTER_SITES= https://download.redis.io/releases/ DISTNAME= redis-${PORTVERSION} @@ -13,72 +13,70 @@ LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/COPYING USES+= compiler:c11 cpe gmake - CPE_VENDOR= redislabs -OPTIONS_DEFINE= JEMALLOC TESTS TLS TRIB -OPTIONS_RADIO= EXTLUA +MAKE_ENV= OPTIMIZATION= \ + V=yo + +OPTIONS_DEFINE= JEMALLOC TESTS TLS TRIB +OPTIONS_RADIO= EXTLUA OPTIONS_RADIO_EXTLUA= LUA LUAJIT LUAJITOR -OPTIONS_SUB= yes +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 LUAJITOR_DESC= Use lang/luajit-openresty instead of builtin lua -TLS_DESC= Use TLS (openssl req.) +LUAJIT_DESC= Use lang/luajit instead of builtin lua +LUA_DESC= Use lang/lua instead of builtin lua TESTS_DESC= Install lang/tcl for redis unit tests +TLS_DESC= Use TLS (openssl req.) TRIB_DESC= Install redis-trib.rb (lang/ruby req.) -MAKE_ENV= V=yo OPTIMIZATION= - JEMALLOC_MAKE_ENV= USE_JEMALLOC=yes - -LUA_USES= lua:51 -LUA_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-src-Makefile.lua -LUA_VARS= _addflags=true - -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 - -LUAJITOR_LIB_DEPENDS= libluajit-5.1.so:lang/luajit-openresty +LUAJITOR_BROKEN= Fails to link LUAJITOR_BUILD_DEPENDS= ${LOCALBASE}/include/luajit-2.1/lua.h:lang/luajit-openresty +LUAJITOR_LIB_DEPENDS= libluajit-5.1.so: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 - -TESTS_USES= tcl:build - -TLS_USES= ssl -TLS_MAKE_ENV= BUILD_TLS=yes - +LUAJITOR_VARS= _ADDFLAGS=true +LUAJIT_BROKEN= Fails to link +LUAJIT_BUILD_DEPENDS= ${LOCALBASE}/include/luajit-2.0/lua.h:lang/luajit +LUAJIT_LIB_DEPENDS= libluajit-5.1.so:lang/luajit +LUAJIT_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-src-Makefile.luajit +LUAJIT_VARS= _ADDFLAGS=true +LUA_BROKEN= Fails to link +LUA_USES= lua:51 +LUA_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-src-Makefile.lua +LUA_VARS= _ADDFLAGS=true +TESTS_USES= tcl:build +TLS_USES= ssl +TLS_MAKE_ENV= BUILD_TLS=yes TRIB_CATEGORIES= ruby -TRIB_USE= ruby=yes TRIB_RUN_DEPENDS= rubygem-redis>=2.2:databases/rubygem-redis +TRIB_USE= RUBY=yes .include -.if ${ARCH} == i386 && ! ${CFLAGS:M-march=*} +.if ${ARCH} == i386 && !${CFLAGS:M-march=*} # Needed for __atomic_fetch_add_8 USE_GCC= yes CFLAGS+= -march=i586 .endif .if defined(_ADDFLAGS) -CFLAGS= -fPIC -LDFLAGS= -Wl,-E +CFLAGS+= -fPIC +LDFLAGS+= -Wl,-E .endif LDFLAGS+= -lpthread -lm -lexecinfo -CONFLICTS?= redis6-6.* redis-devel-6.* +CONFLICTS?= redis-[1-9].* redis-devel-* redis6-* USE_RC_SUBR= redis sentinel -BIN_FILES= redis-benchmark redis-check-aof redis-check-rdb \ - redis-cli redis-sentinel redis-server +BIN_FILES= redis-benchmark redis-check-aof redis-check-rdb redis-cli \ + redis-sentinel redis-server -USERS= redis -GROUPS= redis +USERS= redis +GROUPS= redis REDIS_DBDIR?= /var/db/redis REDIS_RUNDIR?= /var/run/redis @@ -86,24 +84,24 @@ 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} + REDIS_DBDIR=${REDIS_DBDIR} \ + REDIS_LOGDIR=${REDIS_LOGDIR} \ + REDIS_RUNDIR=${REDIS_RUNDIR} \ + REDIS_USER=${USERS} -PLIST_SUB+= REDIS_USER=${USERS} \ - REDIS_GROUP=${GROUPS} \ - REDIS_LOGDIR=${REDIS_LOGDIR} \ - REDIS_DBDIR=${REDIS_DBDIR} \ - REDIS_RUNDIR=${REDIS_RUNDIR} +PLIST_SUB+= REDIS_DBDIR=${REDIS_DBDIR} \ + REDIS_GROUP=${GROUPS} \ + REDIS_LOGDIR=${REDIS_LOGDIR} \ + REDIS_RUNDIR=${REDIS_RUNDIR} \ + REDIS_USER=${USERS} post-patch-JEMALLOC-on: @${REINPLACE_CMD} '35s!Linux!FreeBSD!g' ${WRKSRC}/src/Makefile post-patch-LUA-on: @cd ${WRKSRC}/deps/lua/src && ${CP} fpconv.* lua_* strbuf.* ${WRKSRC}/src/ -post-patch-LUAJIT-on: post-patch-LUA-on -post-patch-LUAJITOR-on: post-patch-LUA-on +post-patch-LUAJIT-on: post-patch-LUA-on +post-patch-LUAJITOR-on: post-patch-LUA-on post-build: ${SED} ${SUB_LIST:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \ diff --git a/databases/redis62/distinfo b/databases/redis62/distinfo index d335fe124752..0b41b07ccf6f 100644 --- a/databases/redis62/distinfo +++ b/databases/redis62/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1633405476 -SHA256 (redis-6.2.6.tar.gz) = 5b2b8b7a50111ef395bf1c1d5be11e6e167ac018125055daa8b5c2317ae131ab -SIZE (redis-6.2.6.tar.gz) = 2476542 +TIMESTAMP = 1651088414 +SHA256 (redis-6.2.7.tar.gz) = b7a79cc3b46d3c6eb52fa37dde34a4a60824079ebdfb3abfbbfa035947c55319 +SIZE (redis-6.2.7.tar.gz) = 2487287