From nobody Thu Nov 2 20:28:02 2023 X-Original-To: dev-commits-ports-main@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 4SLwRk36hnz50P46; Thu, 2 Nov 2023 20:28:02 +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 4SLwRk2cDZz4L1y; Thu, 2 Nov 2023 20:28:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698956882; 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=lue9HO2we+oz58itrO6UTkvdG5eIIXkd4bsSsPs3/8w=; b=LcJgyAcz9ZTLE/W39w50G+0CcbSipWeP5VShL9CPvBIn9vFtlLx8Qnk+5O+e0Sn9V4M1CQ f1nQzx+pl1gA6TOZRUf5GHOzir6PsVxQwle2+KxUi69N1rGutuNZmQyxM4DOE6AtbTbE/n CXnpPXiAd8FxZqOvJvdE4Eh8PnQIMkRHU1qRkM65OfUsK1MPFEaeY31Ksg49zGg/UrVr+z rlEYuWPHHxv5IfulTPbTIBaMnIVqnEPkzHVJPiIdMOFzFQtfnulJ+zOu82Rg1J1j7Ot0nn 45WQHNCwU6XFpTYe+GHEIYICGNfXMW7yvhY4zQC/8sSOXoZW73wvknuuG1Cs4A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698956882; 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=lue9HO2we+oz58itrO6UTkvdG5eIIXkd4bsSsPs3/8w=; b=FlkHYHSAuIUuTnarJvoGAkZT6C6GiPLcIhCbI7ilQl4d3PND3e1nWHUT/7lfH8xr6cBw5O PhPhneOxGmdlBPVbf7xQosoY9wLKPdyCOQUCDdW5iD8uCXITkfW6JoaSFo5/noKsDJpO86 lS50lea/azViMcgQ4WFcbD4NCgPdNP/vSK0jGO/C6AwWsjXo3nXuqouoXuvUTPBD+hMNLV THCehcKzi8UWB5jMH8iCHjm1dIWexubsLBol93pUA5VI+sRSNev/Cnw++SGd1uB2nfSMBG z3p4o1SABwJYSCiq1IQR7aZXemHFojic6cpiaDDIy5vDOMl8BVAqOfFDDYn81Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1698956882; a=rsa-sha256; cv=none; b=Hpt/rbuMd0bv74KQsuoQiMMRJ6CAWFJsBBIvUkactT4Q3KhVGlEYdu1TG1RqyPeqYJu63V QXRHMgjFSmcpRNLM/019n1WByW+HPriu5HmskLNjkn5TAbtkiPC2diva52Gt3sR5JLcsbu G2xLCTGkRjfiBRNLLO87oOzDCqQA4ga+OKRgAmxkZLt3cJRthwxueFnBHzfS+WZT0pyJLj hC5G9Dke8WqSnyuGYzXBIw+3d/D2xdgzNZ2AlYU7PQZCMMptLrG3VY2QrHczdVyP6wGyxF +NyrBPlfXMOmZVQ+8Mb4MLTHrNFPoRy17tVA1EEaaRjC/OZuwAmNY9Pu2Oq7xg== 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 4SLwRk1XJhzkCj; Thu, 2 Nov 2023 20:28:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3A2KS2Kh012210; Thu, 2 Nov 2023 20:28:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3A2KS2aE012207; Thu, 2 Nov 2023 20:28:02 GMT (envelope-from git) Date: Thu, 2 Nov 2023 20:28:02 GMT Message-Id: <202311022028.3A2KS2aE012207@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Ryan Steinmetz Subject: git: 0dda4789af2f - main - databases/keydb: Update to 6.3.4 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zi X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0dda4789af2f85a68e6b7dd6bf623141dd23e147 Auto-Submitted: auto-generated The branch main has been updated by zi: URL: https://cgit.FreeBSD.org/ports/commit/?id=0dda4789af2f85a68e6b7dd6bf623141dd23e147 commit 0dda4789af2f85a68e6b7dd6bf623141dd23e147 Author: Ryan Steinmetz AuthorDate: 2023-11-02 20:27:18 +0000 Commit: Ryan Steinmetz CommitDate: 2023-11-02 20:27:52 +0000 databases/keydb: Update to 6.3.4 --- databases/keydb/Makefile | 15 ++++++----- databases/keydb/distinfo | 6 ++--- databases/keydb/files/patch-src-Makefile | 43 +++++++++++--------------------- 3 files changed, 24 insertions(+), 40 deletions(-) diff --git a/databases/keydb/Makefile b/databases/keydb/Makefile index 71867fc68e0c..d70c0f33afb0 100644 --- a/databases/keydb/Makefile +++ b/databases/keydb/Makefile @@ -1,6 +1,6 @@ PORTNAME= keydb DISTVERSIONPREFIX= v -DISTVERSION= 6.3.3 +DISTVERSION= 6.3.4 CATEGORIES= databases MAINTAINER= zi@FreeBSD.org @@ -15,7 +15,7 @@ LIB_DEPENDS= libuuid.so:misc/e2fsprogs-libuuid \ libsnappy.so:archivers/snappy \ libzstd.so:archivers/zstd -USES= compiler:c11 cpe gmake pkgconfig:build +USES= compiler:c11 cpe gmake localbase:ldflags pkgconfig:build USE_GITHUB= yes GH_ACCOUNT= Snapchat @@ -25,8 +25,7 @@ USE_RC_SUBR= keydb keydb_sentinel MAKE_ENV= OPTIMIZATION= \ V=yo -CFLAGS+= -I${LOCALBASE}/include -LDFLAGS+= -lpthread -lm -lexecinfo -L${LOCALBASE}/lib +LDFLAGS+= -lpthread -lm -lexecinfo SUB_FILES= pkg-message SUB_LIST= PORTNAME=${PORTNAME} \ @@ -44,13 +43,13 @@ PLIST_SUB= KEYDB_DBDIR=${KEYDB_DBDIR} \ KEYDB_RUNDIR=${KEYDB_RUNDIR} \ KEYDB_USER=${USERS} -OPTIONS_DEFINE= TLS -OPTIONS_DEFAULT= TLS +OPTIONS_DEFINE= TLS +OPTIONS_DEFAULT=TLS TLS_DESC= Use TLS (openssl req.) -TLS_USES= ssl -TLS_MAKE_ENV= BUILD_TLS=yes +TLS_USES= ssl +TLS_MAKE_ENV= BUILD_TLS=yes BIN_FILES= keydb-benchmark keydb-check-aof keydb-check-rdb keydb-cli \ keydb-sentinel keydb-server diff --git a/databases/keydb/distinfo b/databases/keydb/distinfo index b858103764f4..afd69f927fce 100644 --- a/databases/keydb/distinfo +++ b/databases/keydb/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1698245036 -SHA256 (Snapchat-KeyDB-v6.3.3_GH0.tar.gz) = c6798cea3fe4ba4d1b42eea6ca2cfaee261786d12bf30aef1a53211d25ab66d9 -SIZE (Snapchat-KeyDB-v6.3.3_GH0.tar.gz) = 11541110 +TIMESTAMP = 1698955833 +SHA256 (Snapchat-KeyDB-v6.3.4_GH0.tar.gz) = 229190b251f921e05aff7b0d2f04b5676c198131e2abbec1e2cfb2e61215e2f3 +SIZE (Snapchat-KeyDB-v6.3.4_GH0.tar.gz) = 5942328 diff --git a/databases/keydb/files/patch-src-Makefile b/databases/keydb/files/patch-src-Makefile index 4703d6eb6daf..c88dc47461f5 100644 --- a/databases/keydb/files/patch-src-Makefile +++ b/databases/keydb/files/patch-src-Makefile @@ -1,6 +1,6 @@ ---- src/Makefile.orig 2023-10-25 15:47:51 UTC +--- src/Makefile.orig 2023-11-02 20:13:44 UTC +++ src/Makefile -@@ -138,21 +138,11 @@ endif +@@ -138,7 +138,6 @@ endif # Override default settings if possible -include .make-settings @@ -8,41 +8,26 @@ FINAL_CFLAGS=$(STD) $(WARN) $(OPT) $(DEBUG) $(CFLAGS) $(KEYDB_CFLAGS) $(REDIS_CFLAGS) FINAL_CXXFLAGS=$(CXX_STD) $(WARN) $(OPT) $(DEBUG) $(CXXFLAGS) $(KEYDB_CFLAGS) $(REDIS_CFLAGS) FINAL_LDFLAGS=$(LDFLAGS) $(KEYDB_LDFLAGS) $(DEBUG) - FINAL_LIBS+=-lm -lz -lcrypto -lbz2 -lzstd -llz4 -lsnappy - --ifneq ($(uname_S),Darwin) -- FINAL_LIBS+=-latomic --endif --# Linux ARM32 needs -latomic at linking time --ifneq (,$(findstring armv,$(uname_M))) -- FINAL_LIBS+=-latomic --endif -- -- - ifeq ($(uname_S),SunOS) - # SunOS - ifeq ($(findstring -m32,$(FINAL_CFLAGS)),) -@@ -211,7 +201,9 @@ ifeq ($(uname_S),NetBSD) - else +@@ -214,9 +213,6 @@ else ifeq ($(uname_S),FreeBSD) # FreeBSD -- FINAL_LIBS+= -lpthread -lexecinfo -+ FINAL_LIBS+= -lpthread -lexecinfo -luuid -+ FINAL_CFLAGS?= $(CFLAGS) $(REDIS_CFLAGS) -I${PREFIX}/include -+ FINAL_LDFLAGS= $(LDFLAGS) -pthread - else - ifeq ($(uname_S),DragonFly) - # DragonFly -@@ -347,7 +339,7 @@ else + FINAL_LIBS+= -lpthread -luuid -lexecinfo +- FINAL_CFLAGS+= -I/usr/local/include +- FINAL_CXXFLAGS+= -I/usr/local/include +- FINAL_LDFLAGS+= -L/usr/local/lib + ifeq ($(USE_BACKTRACE),yes) + FINAL_CFLAGS+= -DUSE_BACKTRACE + endif +@@ -355,7 +351,7 @@ else endif # Alpine OS doesn't have support for the execinfo backtrace library we use for debug, so we provide an alternate implementation using libwunwind. -OS := $(shell cat /etc/os-release | grep ID= | head -n 1 | cut -d'=' -f2) +OS := $(shell uname -r) ifeq ($(OS),alpine) - FINAL_CXXFLAGS+=-DUNW_LOCAL_ONLY -DALPINE - FINAL_LIBS += -lunwind -@@ -417,7 +409,6 @@ persist-settings: distclean + FINAL_CXXFLAGS+=-DUNW_LOCAL_ONLY + FINAL_CXXFLAGS+=-DALPINE +@@ -426,7 +422,6 @@ persist-settings: distclean echo PREV_FINAL_CFLAGS=$(FINAL_CFLAGS) >> .make-settings echo PREV_FINAL_CXXFLAGS=$(FINAL_CXXFLAGS) >> .make-settings echo PREV_FINAL_LDFLAGS=$(FINAL_LDFLAGS) >> .make-settings