From nobody Fri May 10 21:20:11 2024 X-Original-To: dev-commits-ports-branches@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 4VbhcC5qxJz5KRv9; Fri, 10 May 2024 21:20:11 +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 4VbhcC5ClNz4dyY; Fri, 10 May 2024 21:20:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1715376011; 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=VpYSyC5uC5IaTmQ3noGchSFf5/bfTC2WIO8joAK4lHk=; b=weAK+harsSgnVxaL/LQlqqDInApeYzjsk/K8YjQj2MAeavkynD1olJgaxMwzfIzewRQIOj 6oI+8II8or0Wyq2jXzj664bnBG1q/OfkP4ZnCobCaJxnpeAq5LDjicd1wOGrbdLkTzBzjS a4py+RH8mCsy5cUIa5Fg07ErFutdsa8JugC7y9+HgOaF4S5psS2oOXpoX8d5ShxKtMDHah uwDPAt5TANetS5+k643/DCrO6Soe2IA7SXD450y6yMCWVMhrt4FrhnwkU/6lF2y1MW5nTL YT2XscG+UXYoZ51/BlsA/4U2vM7azIEyyeOmsXS3DDCfq1oLol967yQotTUyKg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1715376011; a=rsa-sha256; cv=none; b=d9ty3zZAMOSppOuzei578Ac3YVG050x1P7l1pyUpWATACJF1fuq480hXV+6YkNLFUrQbZM NKwTYM2jBrPzRn+KIqvko6UZruZ6g3Xxl+LRF4B++uJc2euOiZFP1+UNGsKJOvhafiigvb blTDfh6cgltm4TcCc2GixdjPdA/FZX3Qp2u5RneZaknVnY8Em/VzBOMppRZVdGJ/OS8a8v D+Buv4j2rKLx4vR+MFKLBSL5TICCUPt47G/wNADm8lxzcT8fqfaBbwLzSc5kkbX2QMvn2j XGtae08YuWKkU01vlrF+B6mlbYNLYK/Ae/bXeSlhkU0teSsVKlDhmbSin4zcyg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1715376011; 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=VpYSyC5uC5IaTmQ3noGchSFf5/bfTC2WIO8joAK4lHk=; b=BH4IGhP8kejjrk0HhLLWxOQgoECOqS2AFy6hOJzA1g7FKGuwsunaET82gi7EtDqyHyZJIM tIwu+BiFCYtXu/LebyT5gXMKT4n0Vo1dShY4h3N/k07Ff0klYo2EpI8Z0sMtdX65J3VIyj NsGMG4nK9CcEVa/GjktJvvY715PTU9Z7ZA6eMa2fnxi19pT787yA8xzF7PtfkcK4FK3x4n dF6nbC6kHy035kGMfoYlmnmhb++tuPgMeqApvM3btLVDM/9W3MSmS2r/QLoAPw9CA83vmb yokxoaAH08jge0nu0BcEjmfg/SYvYpNnvtwo5tVHCICVXrjGRNYk2KhySjodFg== 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 4VbhcC4Nynzsb4; Fri, 10 May 2024 21:20:11 +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 44ALKBrL088226; Fri, 10 May 2024 21:20:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 44ALKBSv088217; Fri, 10 May 2024 21:20:11 GMT (envelope-from git) Date: Fri, 10 May 2024 21:20:11 GMT Message-Id: <202405102120.44ALKBSv088217@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Nuno Teixeira Subject: git: 469adf44f1c6 - 2024Q2 - archivers/urbackup-{client,server}: Fix segfault (cryptopp) List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-branches@freebsd.org Sender: owner-dev-commits-ports-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: eduardo X-Git-Repository: ports X-Git-Refname: refs/heads/2024Q2 X-Git-Reftype: branch X-Git-Commit: 469adf44f1c6f846ea06e4de2e5bae0e3339c7f3 Auto-Submitted: auto-generated The branch 2024Q2 has been updated by eduardo: URL: https://cgit.FreeBSD.org/ports/commit/?id=469adf44f1c6f846ea06e4de2e5bae0e3339c7f3 commit 469adf44f1c6f846ea06e4de2e5bae0e3339c7f3 Author: ek AuthorDate: 2024-05-10 15:19:22 +0000 Commit: Nuno Teixeira CommitDate: 2024-05-10 21:11:30 +0000 archivers/urbackup-{client,server}: Fix segfault (cryptopp) - Add -DCRYPTOPP_DISABLE_ASM to CXXFLAGS on i386 and amd64, as cryptopp-8.7.0 build with this option by default on i386 and amd64. (5a19c08: security/cryptopp: Update to 8.7.0) PR: 266531, 278163, 278859 MFH: 2024Q2 (cherry picked from commit 577ac1f839b1b164bd42af7c94a15be017b5e1d7) --- archivers/urbackup-client/Makefile | 10 +++++++++- archivers/urbackup-server/Makefile | 10 +++++++++- 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/archivers/urbackup-client/Makefile b/archivers/urbackup-client/Makefile index 59cd8bb07237..68a533fc0568 100644 --- a/archivers/urbackup-client/Makefile +++ b/archivers/urbackup-client/Makefile @@ -1,6 +1,6 @@ PORTNAME= urbackup-client DISTVERSION= 2.5.20.0 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= archivers MASTER_SITES= https://hndl.urbackup.org/Client/${DISTVERSION:R}/ @@ -40,6 +40,14 @@ GUI_CONFIGURE_OFF= --enable-headless CONFFILES= mariadbdump.conf mariadbxtrabackup.conf postgresbase.conf \ postgresqldump.conf +.include + +# Fix segmentation fault, PR 266531 +# see also 5a19c08: security/cryptopp: Update to 8.7.0 +.if ${ARCH} == i386 || ${ARCH} == amd64 +CXXFLAGS+= -DCRYPTOPP_DISABLE_ASM +.endif + post-patch: @${SED} -i "" -e "s:%%PREFIX%%:${PREFIX}:g" \ ${WRKSRC}/urbackupclient/backup_scripts/postgresqldump diff --git a/archivers/urbackup-server/Makefile b/archivers/urbackup-server/Makefile index 9e1496f50f5e..d8677cfa4f21 100644 --- a/archivers/urbackup-server/Makefile +++ b/archivers/urbackup-server/Makefile @@ -1,6 +1,6 @@ PORTNAME= urbackup-server DISTVERSION= 2.5.26 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= archivers MASTER_SITES= https://hndl.urbackup.org/Server/${DISTVERSION}/ @@ -25,6 +25,14 @@ GNU_CONFIGURE= yes CONFIGURE_ARGS= --enable-packaging --with-mountvhd --without-embedded-sqlite3 --without-embedded-lmdb --without-embedded-lua LDFLAGS+= -L${LOCALBASE}/lib +.include + +# Fix segmentation fault, PR 266531 +# see also 5a19c08: security/cryptopp: Update to 8.7.0 +.if ${ARCH} == i386 || ${ARCH} == amd64 +CXXFLAGS+= -DCRYPTOPP_DISABLE_ASM +.endif + SUB_FILES= pkg-message urbackupsrv.conf.sample-daemon USERS= urbackup